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/de3dcc2d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de3dcc2d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/de3dcc2d Branch: refs/heads/master Commit: de3dcc2da654bcaf5238b388de8c2971ef820fd6 Parents: 464f736 4d2a73d Author: Josh Elser <els...@apache.org> Authored: Wed Sep 10 21:28:56 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Wed Sep 10 21:28:56 2014 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/test/VolumeIT.java | 15 ++++++++++----- .../apache/accumulo/test/functional/ReadWriteIT.java | 4 ++-- .../test/functional/SslWithClientAuthIT.java | 15 ++++++++++----- 3 files changed, 22 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/de3dcc2d/test/src/test/java/org/apache/accumulo/test/VolumeIT.java ----------------------------------------------------------------------
