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/fa10a314 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fa10a314 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fa10a314 Branch: refs/heads/master Commit: fa10a3143cae2bac0b356ecce8ddd9b49fd7bf03 Parents: de3dcc2 c566e93 Author: Josh Elser <els...@apache.org> Authored: Wed Sep 10 22:53:43 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Wed Sep 10 22:53:43 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, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fa10a314/test/src/test/java/org/apache/accumulo/test/VolumeIT.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fa10a314/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java ----------------------------------------------------------------------