Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/56e4483d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/56e4483d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/56e4483d Branch: refs/heads/master Commit: 56e4483d42ed03b4f0d08dd9f7f7ef15bd3c75b2 Parents: aa35d79 230a938 Author: Josh Elser <[email protected]> Authored: Tue Nov 4 14:16:18 2014 -0500 Committer: Josh Elser <[email protected]> Committed: Tue Nov 4 14:16:18 2014 -0500 ---------------------------------------------------------------------- .../accumulo/test/ConditionalWriterIT.java | 100 +++++++++++-------- .../test/RewriteTabletDirectoriesIT.java | 23 +++-- .../org/apache/accumulo/test/ShellServerIT.java | 2 +- .../accumulo/test/functional/ShutdownIT.java | 17 ++-- 4 files changed, 81 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/56e4483d/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/56e4483d/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java ----------------------------------------------------------------------
