Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32f27693 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32f27693 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/32f27693 Branch: refs/heads/master Commit: 32f27693fc71a3fd35ab9295fabc37027779b871 Parents: fa10a31 a9ea7a9 Author: Josh Elser <els...@apache.org> Authored: Wed Sep 10 22:59:52 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Wed Sep 10 22:59:52 2014 -0700 ---------------------------------------------------------------------- test/src/test/java/org/apache/accumulo/test/VolumeIT.java | 3 +-- .../java/org/apache/accumulo/test/functional/CreateAndUseIT.java | 3 +-- .../java/org/apache/accumulo/test/functional/ReadWriteIT.java | 3 +-- .../org/apache/accumulo/test/functional/SslWithClientAuthIT.java | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/32f27693/test/src/test/java/org/apache/accumulo/test/VolumeIT.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/32f27693/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java ----------------------------------------------------------------------