Merge branch '1.6.2-SNAPSHOT'
Conflicts:
test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/159d1b99
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/159d1b99
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/159d1b99
Branch: refs/heads/master
Commit: 159d1b99daab5e2273b63138d63c7bd04fa56bec
Parents: fa7e866 2ad4074
Author: Josh Elser <[email protected]>
Authored: Fri Sep 26 16:49:51 2014 -0400
Committer: Josh Elser <[email protected]>
Committed: Fri Sep 26 16:49:51 2014 -0400
----------------------------------------------------------------------
.../accumulo/test/functional/ExamplesIT.java | 118 ++++++++-----------
1 file changed, 48 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
