tree d69e3a24093edef6e0a53e2d67a3687794e5734b
parent b07917a0f18441075cf03aa98da33035ca866073
parent 1198687b9b538bb03130be086f3ccafa9e815244
author Josh Elser <elserj@apache.org> 1367693338 +0000
committer Josh Elser <elserj@apache.org> 1367693338 +0000

ACCUMULO-1166 Merge from the 1.4 stuff up to trunk, accounting for the 1.5.0-RC changes


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