[11/23] accumulo git commit: Merge branch '1.7'

[elserj]

Merge branch '1.7'

Conflicts:
        
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f7691bd6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f7691bd6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f7691bd6

Branch: refs/heads/master
Commit: f7691bd6318c28ba1363dbc8acb1a04f3afaae98
Parents: 2b6e68b 99871f0
Author: Josh Elser <els...@apache.org>
Authored: Tue Dec 1 17:23:46 2015 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Tue Dec 1 17:23:46 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/proxy/Proxy.java   |   3 +-
 .../apache/accumulo/server/rpc/RpcWrapper.java  |  79 +++++-
 .../accumulo/server/rpc/RpcWrapperTest.java     | 274 +++++++++++++++++++
 .../accumulo/gc/SimpleGarbageCollector.java     |   2 +-
 .../java/org/apache/accumulo/master/Master.java |   5 +-
 .../apache/accumulo/tserver/TabletServer.java   |   4 +-
 6 files changed, 353 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f7691bd6/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f7691bd6/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f7691bd6/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 72d21c2,3022a76..1af114c
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -2292,8 -2331,8 +2292,8 @@@ public class TabletServer extends Accum
  
    private HostAndPort startTabletClientService() throws UnknownHostException {
      // start listening for client connection last
 -    ThriftClientHandler handler = new ThriftClientHandler();
 -    Iface rpcProxy = RpcWrapper.service(handler, new 
Processor<Iface>(handler).getProcessMapView());
 +    clientHandler = new ThriftClientHandler();
-     Iface rpcProxy = RpcWrapper.service(new ThriftClientHandler());
++    Iface rpcProxy = RpcWrapper.service(clientHandler, new 
Processor<Iface>(clientHandler).getProcessMapView());
      final Processor<Iface> processor;
      if (ThriftServerType.SASL == getThriftServerType()) {
        Iface tcredProxy = TCredentialsUpdatingWrapper.service(rpcProxy, 
ThriftClientHandler.class, getConfiguration());