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/342b6b30 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/342b6b30 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/342b6b30 Branch: refs/heads/master Commit: 342b6b3028e29f1496de5f8e00fe0a1363e74bba Parents: ca5928e ef902f2 Author: Josh Elser <josh.el...@gmail.com> Authored: Tue May 26 17:09:08 2015 -0400 Committer: Josh Elser <josh.el...@gmail.com> Committed: Tue May 26 17:09:08 2015 -0400 ---------------------------------------------------------------------- .../tserver/replication/AccumuloReplicaSystem.java | 16 ++++++++++------ .../tserver/replication/ReplicationProcessor.java | 4 +++- 2 files changed, 13 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
