You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2021/03/04 14:15:22 UTC

[cassandra] branch trunk updated (2d9d178 -> 995ce0e)

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 2d9d178  Fix cassandra-stress JMX connection
     new a66246f  Upgrade jackson-databind to 2.9.10.8
     new 995ce0e  Merge branch 'cassandra-3.11' into trunk

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt                                        |   1 +
 build.xml                                          |   2 +-
 ...-2.9.10.4.jar => jackson-databind-2.9.10.8.jar} | Bin 1349395 -> 1350092 bytes
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename lib/{jackson-databind-2.9.10.4.jar => jackson-databind-2.9.10.8.jar} (91%)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 995ce0ee21df790a62a8e0709c0e39aa375e5201
Merge: 2d9d178 a66246f
Author: Brandon Williams <br...@apache.org>
AuthorDate: Thu Mar 4 08:14:57 2021 -0600

    Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt                                        |   1 +
 build.xml                                          |   2 +-
 ...-2.9.10.4.jar => jackson-databind-2.9.10.8.jar} | Bin 1349395 -> 1350092 bytes
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 5c7da2a,de0b083..69bf45e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,36 @@@
 -3.11.11
 +4.0-beta5
 + * Fix cassandra-stress JMX connection (CASSANDRA-16473)
 + * Avoid processing redundant application states on endpoint changes (CASSANDRA-16381)
 + * Prevent parent repair sessions leak (CASSANDRA-16446)
 + * Fix timestamp issue in SinglePartitionSliceCommandTest testPartitionD…eletionRowDeletionTie (CASSANDRA-16443)
 + * Promote protocol V5 out of beta (CASSANDRA-14973)
 + * Fix incorrect encoding for strings can be UTF8 (CASSANDRA-16429)
 + * Fix node unable to join when RF > N in multi-DC with added warning (CASSANDRA-16296)
 + * Add an option to nodetool tablestats to check sstable location correctness (CASSANDRA-16344) 
 + * Unable to ALTER KEYSPACE while decommissioned/assassinated nodes are in gossip (CASSANDRA-16422)
 + * Metrics backward compatibility restored after CASSANDRA-15066 (CASSANDRA-16083)
 + * Reduce new reserved keywords introduced since 3.0 (CASSANDRA-16439)
 + * Improve system tables handling in case of disk failures (CASSANDRA-14793)
 + * Add access and datacenters to unreserved keywords (CASSANDRA-16398)
 + * Fix nodetool ring, status output when DNS resolution or port printing are in use (CASSANDRA-16283)
 + * Upgrade Jacoco to 0.8.6 (for Java 11 support) (CASSANDRA-16365)
 + * Move excessive repair debug loggings to trace level (CASSANDRA-16406)
 + * Restore validation of each message's protocol version (CASSANDRA-16374)
 + * Upgrade netty and chronicle-queue dependencies to get Auditing and native library loading working on arm64 architectures (CASSANDRA-16384,CASSANDRA-16392)
 + * Release StreamingTombstoneHistogramBuilder spool when switching writers (CASSANDRA-14834)
 + * Correct memtable on-heap size calculations to match actual use (CASSANDRA-16318)
 + * Fix client notifications in CQL protocol v5 (CASSANDRA-16353)
 + * Too defensive check when picking sstables for preview repair (CASSANDRA-16284)
 + * Ensure pre-negotiation native protocol responses have correct stream id (CASSANDRA-16376)
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols (CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, in the cassandra-all pom (CASSANDRA-16303)
 + * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 +Merged from 3.11:
+  * Upgrade jackson-databind to 2.9.10.8 (CASSANDRA-16462)
 + * Fix digest computation for queries with fetched but non queried columns (CASSANDRA-15962)
 + * Reduce amount of allocations during batch statement execution (CASSANDRA-16201)
 + * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
  Merged from 3.0:
   * Fix ColumnFilter behaviour to prevent digest mitmatches during upgrades (CASSANDRA-16415)
   * Update debian packaging for python3 (CASSANDRA-16396)
diff --cc build.xml
index fee69a0,959dd32..36db9e5
--- a/build.xml
+++ b/build.xml
@@@ -576,13 -402,13 +576,13 @@@
            <dependency groupId="org.antlr" artifactId="antlr-runtime" version="3.5.2">
              <exclusion groupId="org.antlr" artifactId="stringtemplate"/>
            </dependency>
 -          <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.7.7"/>
 -          <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j" version="1.7.7"/>
 -          <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j" version="1.7.7" />
 -          <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.1.3"/>
 -          <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.1.3"/>
 +          <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.7.25"/>
 +          <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j" version="1.7.25"/>
 +          <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j" version="1.7.25" />
 +          <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.2.3"/>
 +          <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.2.3"/>
            <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.9.10"/>
-           <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-databind" version="2.9.10.4"/>
+           <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-databind" version="2.9.10.8"/>
            <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-annotations" version="2.9.10"/>
            <dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
            <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org