tree 480fc733742b45eff0bf1c49f8bb9d45c997d9a7
parent 8a9152b09d1a15c0e444a71b2766aab57cf0ee52
author Josh Elser <elserj@apache.org> 1362802860 +0000
committer Josh Elser <elserj@apache.org> 1362802860 +0000

ACCUMULO-1166 Start the merging from the 1.5 branch to keep this version in sync


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