Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c121ae2d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c121ae2d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c121ae2d Branch: refs/heads/master Commit: c121ae2d2ca4a4a4d50bc1061059aa5ef473718f Parents: fe5fc30 34c8b7a Author: Josh Elser <els...@apache.org> Authored: Sat Mar 15 23:31:42 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sat Mar 15 23:31:42 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/test/functional/BulkIT.java | 9 +++++---- .../java/org/apache/accumulo/test/functional/SslIT.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
