Merge branch '1.6.0-SNAPSHOT' into ACCUMULO-2061
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2c1af655 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2c1af655 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2c1af655 Branch: refs/heads/ACCUMULO-2061 Commit: 2c1af655c9a32a3a49417c049a1dd2fd7b658566 Parents: 6414ff1 34c8b7a Author: Josh Elser <els...@apache.org> Authored: Sat Mar 15 23:36:13 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sat Mar 15 23:36:13 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(-) ----------------------------------------------------------------------
