Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5fbd6715 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5fbd6715 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5fbd6715 Branch: refs/heads/master Commit: 5fbd67157d05efa85b54cd350ef2a0f32302214d Parents: f6bd3ee d71e5ee Author: Josh Elser <els...@apache.org> Authored: Mon Jun 1 15:40:07 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Jun 1 15:40:07 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5fbd6715/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5fbd6715/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java ----------------------------------------------------------------------
