diff options
| author | Simon Willnauer <simon.willnauer@elasticsearch.com> | 2016-07-05 11:11:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-05 11:11:55 +0200 |
| commit | a4ec0ac22f153750b80a9b1de9788c2fb80cd67e (patch) | |
| tree | e782860219e947c2739f138ff1dc34e3d7d72fcf | |
| parent | 84efaf4579b297bf8fb0e41dbe7b1ff19fc4e965 (diff) | |
Upgrade to netty 3.10.6.Final (#19235)
4 files changed, 4 insertions, 4 deletions
diff --git a/core/build.gradle b/core/build.gradle index 88c5cc2a16..2231880176 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -75,7 +75,7 @@ dependencies { compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}" // network stack - compile 'io.netty:netty:3.10.5.Final' + compile 'io.netty:netty:3.10.6.Final' // percentiles aggregation compile 'com.tdunning:t-digest:3.0' // precentil ranks aggregation diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingIT.java b/core/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingIT.java index 06ac6aeb57..7715749fdf 100644 --- a/core/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingIT.java +++ b/core/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingIT.java @@ -30,6 +30,7 @@ import org.elasticsearch.common.transport.InetSocketTransportAddress; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.BigArrays; +import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.discovery.zen.elect.ElectMasterService; import org.elasticsearch.discovery.zen.ping.PingContextProvider; import org.elasticsearch.discovery.zen.ping.ZenPing; @@ -42,7 +43,6 @@ import org.elasticsearch.transport.TransportConnectionListener; import org.elasticsearch.transport.TransportService; import org.elasticsearch.transport.TransportSettings; import org.elasticsearch.transport.netty.NettyTransport; -import org.jboss.netty.util.internal.ConcurrentHashMap; import java.net.InetSocketAddress; import java.util.concurrent.ConcurrentMap; @@ -208,7 +208,7 @@ public class UnicastZenPingIT extends ESTestCase { final TransportService transportService = new TransportService(settings, transport, threadPool); transportService.start(); transportService.acceptIncomingRequests(); - ConcurrentMap<TransportAddress, AtomicInteger> counters = new ConcurrentHashMap<>(); + ConcurrentMap<TransportAddress, AtomicInteger> counters = ConcurrentCollections.newConcurrentMap(); transportService.addConnectionListener(new TransportConnectionListener() { @Override public void onNodeConnected(DiscoveryNode node) { diff --git a/distribution/licenses/netty-3.10.5.Final.jar.sha1 b/distribution/licenses/netty-3.10.5.Final.jar.sha1 deleted file mode 100644 index 6f190752e9..0000000000 --- a/distribution/licenses/netty-3.10.5.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9ca7d55d246092bddd29b867706e2f6c7db701a0 diff --git a/distribution/licenses/netty-3.10.6.Final.jar.sha1 b/distribution/licenses/netty-3.10.6.Final.jar.sha1 new file mode 100644 index 0000000000..3587284665 --- /dev/null +++ b/distribution/licenses/netty-3.10.6.Final.jar.sha1 @@ -0,0 +1 @@ +18ed04a0e502896552854926e908509db2987a00
\ No newline at end of file |