Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0f9cf23 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0f9cf23 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0f9cf23 Branch: refs/heads/cassandra-3.0 Commit: f0f9cf232bf51107c855062c8b5b0196d0e90246 Parents: 2593809 eb0f443 Author: Robert Stupp <sn...@snazy.de> Authored: Thu Feb 9 20:37:32 2017 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Thu Feb 9 20:37:32 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 +- lib/licenses/netty-all-4.0.23.Final.txt | 202 ------------------- lib/licenses/netty-all-4.0.44.Final.txt | 202 +++++++++++++++++++ lib/netty-all-4.0.23.Final.jar | Bin 1779991 -> 0 bytes lib/netty-all-4.0.44.Final.jar | Bin 0 -> 2342652 bytes .../org/apache/cassandra/transport/Message.java | 12 +- 7 files changed, 212 insertions(+), 207 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0f9cf23/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 086e0e5,0c7d129..c8419ab --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,5 +1,34 @@@ -2.1.17 +2.2.9 + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673) + * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935) + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899) + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281) + * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792) + * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901) + * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863) + * Fix Util.spinAssertEquals (CASSANDRA-12283) + * Fix potential NPE for compactionstats (CASSANDRA-12462) + * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813) + * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754) + * Clean up permissions when a UDA is dropped (CASSANDRA-12720) + * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-11117) + * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457) + * Fix merkle tree depth calculation (CASSANDRA-12580) + * Make Collections deserialization more robust (CASSANDRA-12618) + * Better handle invalid system roles table (CASSANDRA-12700) + * Split consistent range movement flag correction (CASSANDRA-12786) + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) +Merged from 2.1: + * Upgrade netty version to fix memory leak with client encryption (CASSANDRA-13114) * Fix paging for DISTINCT queries on partition keys and static columns (CASSANDRA-13017) * Fix race causing infinite loop if Thrift server is stopped before it starts listening (CASSANDRA-12856) * cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0f9cf23/build.xml ---------------------------------------------------------------------- diff --cc build.xml index d9f8198,91dc34b..94e4723 --- a/build.xml +++ b/build.xml @@@ -402,26 -400,16 +402,26 @@@ <dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}" /> <dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift" version="${version}" /> - <dependency groupId="com.yammer.metrics" artifactId="metrics-core" version="2.2.0" /> - <dependency groupId="com.addthis.metrics" artifactId="reporter-config" version="2.1.0" /> + <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="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.23.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="2.0.9.2" /> + <!-- TODO CASSANDRA-9543 + <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="2.1.5" classifier="shaded" /> + --> + <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj" version="4.4.2" /> + <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.3.4" /> <dependency groupId="net.sf.supercsv" artifactId="super-csv" version="2.1.0" /> <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"/> + </dependency> + <dependency groupId="joda-time" artifactId="joda-time" version="2.4" /> + </dependencyManagement> <developer id="alakshman" name="Avinash Lakshman"/> <developer id="aleksey" name="Aleksey Yeschenko"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0f9cf23/src/java/org/apache/cassandra/transport/Message.java ----------------------------------------------------------------------