Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c093b561 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c093b561 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c093b561 Branch: refs/heads/master Commit: c093b561d60fb6877ca6a09820d764803ba41c42 Parents: cae0790 5f6882f Author: Josh Elser <els...@apache.org> Authored: Wed May 3 17:07:33 2017 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed May 3 17:07:33 2017 -0400 ---------------------------------------------------------------------- .../core/client/impl/ReplicationClient.java | 10 ++++++---- .../org/apache/accumulo/core/conf/Property.java | 2 ++ .../org/apache/accumulo/core/rpc/ThriftUtil.java | 2 +- .../replication/AccumuloReplicaSystem.java | 19 ++++++++++++------- 4 files changed, 21 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c093b561/core/src/main/java/org/apache/accumulo/core/conf/Property.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c093b561/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java ----------------------------------------------------------------------
