Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d5cd2d4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d5cd2d4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d5cd2d4 Branch: refs/heads/cassandra-3.11 Commit: 6d5cd2d459940f37dd1bb629b37add33d8f7272f Parents: 6a504f4 a696ab3 Author: Robert Stupp <[email protected]> Authored: Thu Feb 9 20:50:41 2017 +0100 Committer: Robert Stupp <[email protected]> Committed: Thu Feb 9 20:50:41 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 +- lib/licenses/netty-all-4.0.39.Final.txt | 202 ------------------- lib/licenses/netty-all-4.0.44.Final.txt | 202 +++++++++++++++++++ lib/netty-all-4.0.39.Final.jar | Bin 2271610 -> 0 bytes lib/netty-all-4.0.44.Final.jar | Bin 0 -> 2342652 bytes .../org/apache/cassandra/transport/Message.java | 6 +- 7 files changed, 208 insertions(+), 205 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d5cd2d4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index eb10bad,d8c1625..3073fd7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -235,13 -107,10 +235,14 @@@ Merged from 2.2 * Fix exceptions when enabling gossip on nodes that haven't joined the ring (CASSANDRA-12253) * Fix authentication problem when invoking cqlsh copy from a SOURCE command (CASSANDRA-12642) * Decrement pending range calculator jobs counter in finally block - (CASSANDRA-12554) + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481) + * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523) + * Fail repair on non-existing table (CASSANDRA-12279) + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522) * Split consistent range movement flag correction (CASSANDRA-12786) Merged from 2.1: - * Add system property to set the max number of native transport requests in queue (CASSANDRA-11363) ++ * Upgrade netty version to fix memory leak with client encryption (CASSANDRA-13114) + * cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959) * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d5cd2d4/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 0fdf5f3,a182f45..49dd95a --- a/build.xml +++ b/build.xml @@@ -426,21 -396,16 +426,21 @@@ <dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift" version="${version}" /> <dependency groupId="io.dropwizard.metrics" artifactId="metrics-core" version="3.1.0" /> <dependency groupId="io.dropwizard.metrics" artifactId="metrics-jvm" version="3.1.0" /> - <dependency groupId="com.addthis.metrics" artifactId="reporter-config3" version="3.0.0" /> + <dependency groupId="com.addthis.metrics" artifactId="reporter-config3" version="3.0.3" /> <dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.3m" /> <dependency groupId="io.airlift" artifactId="airline" version="0.6" /> - <dependency groupId="io.netty" artifactId="netty-all" version="4.0.39.Final" /> + <dependency groupId="io.netty" artifactId="netty-all" version="4.0.44.Final" /> <dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2" /> <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" /> - <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.0.1" classifier="shaded" /> + <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.0.1" classifier="shaded"> + <exclusion groupId="io.netty" artifactId="netty-buffer"/> + <exclusion groupId="io.netty" artifactId="netty-codec"/> + <exclusion groupId="io.netty" artifactId="netty-handler"/> + <exclusion groupId="io.netty" artifactId="netty-transport"/> + </dependency> <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj" version="4.4.2" /> - <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.4.3" /> - <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="0.4.3" /> + <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.4.4" /> + <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="0.4.4" /> <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations" version="1.2.0" /> <dependency groupId="org.fusesource" artifactId="sigar" version="1.6.4"> <exclusion groupId="log4j" artifactId="log4j"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d5cd2d4/src/java/org/apache/cassandra/transport/Message.java ----------------------------------------------------------------------
