Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f8d61db Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4f8d61db Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4f8d61db Branch: refs/heads/master Commit: 4f8d61db591343a31c0c31b7ea2f1f09da1afb6f Parents: a108651 5fbd671 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Mon Jun 1 16:47:39 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Mon Jun 1 16:47:39 2015 -0400 ---------------------------------------------------------------------- .../impl/MiniAccumuloClusterImpl.java | 10 ++++++-- .../security/handler/KerberosAuthenticator.java | 8 +++++-- .../apache/accumulo/test/TableOperationsIT.java | 24 ++++++++++++++++---- .../replication/MultiInstanceReplicationIT.java | 7 ++++++ 4 files changed, 41 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
