tree 0639550ee06159d9d33370a521fdf4adb29eb628
parent c720b284c6683a8d0c7fd8216941386ffaf9e299
parent 6bbe8eb9c04efe9aa69b25b964e0658dc8d160d3
author Josh Elser <elserj@apache.org> 1369706523 +0000
committer Josh Elser <elserj@apache.org> 1369706523 +0000

ACCUMULO-1166 Merge 1.5 to trunk


git-svn-id: https://svn.apache.org/repos/asf/accumulo/contrib/instamo-archetype/trunk@1486729 13f79535-47bb-0310-9956-ffa450edef68