accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [6/6] accumulo git commit: Merge branch '1.7'
Date Thu, 03 Dec 2015 21:08:22 GMT
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/46e5d5c8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46e5d5c8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46e5d5c8

Branch: refs/heads/master
Commit: 46e5d5c8d14c6fcacad5c15c71f5921d8333bd85
Parents: 7dc3736 0e3af1e
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Dec 3 16:06:51 2015 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Dec 3 16:06:51 2015 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/accumulo/proxy/Proxy.java  |  2 +-
 .../java/org/apache/accumulo/server/rpc/RpcWrapper.java | 12 ++++++------
 .../org/apache/accumulo/server/rpc/RpcWrapperTest.java  |  9 +++------
 .../org/apache/accumulo/gc/SimpleGarbageCollector.java  |  2 +-
 .../main/java/org/apache/accumulo/master/Master.java    |  4 ++--
 .../java/org/apache/accumulo/tserver/TabletServer.java  |  4 ++--
 6 files changed, 15 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


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

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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/46e5d5c8/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 1af114c,1080d8d..cc4ee73
--- 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));
 +    clientHandler = new ThriftClientHandler();
-     Iface rpcProxy = RpcWrapper.service(clientHandler, new Processor<Iface>(clientHandler).getProcessMapView());
++    Iface rpcProxy = RpcWrapper.service(clientHandler, new Processor<Iface>(clientHandler));
      final Processor<Iface> processor;
      if (ThriftServerType.SASL == getThriftServerType()) {
        Iface tcredProxy = TCredentialsUpdatingWrapper.service(rpcProxy, ThriftClientHandler.class,
getConfiguration());


Mime
View raw message