You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2016/06/10 19:14:14 UTC
hbase git commit: HBASE-16004 Update to Netty 4.1.1
Repository: hbase
Updated Branches:
refs/heads/master 6da6babe4 -> bd45cf347
HBASE-16004 Update to Netty 4.1.1
Signed-off-by: stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bd45cf34
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bd45cf34
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bd45cf34
Branch: refs/heads/master
Commit: bd45cf34762332a3a51f605798a3e050e7a1e62e
Parents: 6da6bab
Author: Jurriaan Mous <ju...@jurmo.us>
Authored: Fri Jun 10 17:57:42 2016 +0200
Committer: stack <st...@apache.org>
Committed: Fri Jun 10 12:14:05 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java | 4 ++--
pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/bd45cf34/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
index c1ed748..723a234 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
@@ -347,13 +347,13 @@ public class AsyncRpcClient extends AbstractRpcClient {
}
// do not close global EventLoopGroup.
if (!useGlobalEventLoopGroup) {
- bootstrap.group().shutdownGracefully();
+ bootstrap.config().group().shutdownGracefully();
}
}
@Override
public EventLoop getEventExecutor() {
- return this.bootstrap.group().next();
+ return this.bootstrap.config().group().next();
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/bd45cf34/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0e33ae8..93b7a0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1254,7 +1254,7 @@
<clover.version>4.0.3</clover.version>
<jamon-runtime.version>2.4.1</jamon-runtime.version>
<jettison.version>1.3.3</jettison.version>
- <netty.version>4.0.30.Final</netty.version>
+ <netty.version>4.1.1.Final</netty.version>
<netty.hadoop.version>3.6.2.Final</netty.hadoop.version>
<joni.version>2.1.2</joni.version>
<jcodings.version>1.0.8</jcodings.version>