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/eb427d7b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eb427d7b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eb427d7b Branch: refs/heads/master Commit: eb427d7b92e553d45d085f84a65c78baceca8639 Parents: 9832795 e84ff66 Author: Josh Elser <[email protected]> Authored: Thu Aug 21 18:08:22 2014 -0400 Committer: Josh Elser <[email protected]> Committed: Thu Aug 21 18:08:22 2014 -0400 ---------------------------------------------------------------------- .../test/functional/DeleteTableDuringSplitIT.java | 2 +- .../java/org/apache/accumulo/test/functional/MergeIT.java | 2 +- .../test/functional/SimpleBalancerFairnessIT.java | 10 +++++----- .../java/org/apache/accumulo/test/functional/SslIT.java | 10 +++++----- .../accumulo/test/functional/SslWithClientAuthIT.java | 10 +++++----- 5 files changed, 17 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
