This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 3018499540b9083b7bec19f0943987270d9bb342
Merge: 2022cfe b41873d
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Tue Mar 9 22:30:17 2021 +0100
Merge branch 'cassandra-2.2' into cassandra-3.0
CHANGES.txt | 1 +
redhat/cassandra.spec | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --cc CHANGES.txt
index c174cd3,cdb2def..c9aba6a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,6 +1,30 @@@
-2.2.20
+3.0.25:
+ * Fix ColumnFilter behaviour to prevent digest mitmatches during upgrades
(CASSANDRA-16415)
+ * Update debian packaging for python3 (CASSANDRA-16396)
+ * Avoid pushing schema mutations when setting up distributed system
keyspaces locally (CASSANDRA-16387)
+Merged from 2.2:
+ * Fix centos packaging for arm64, >=3.0 rpm's now require python3
(CASSANDRA-16477)
* Make TokenMetadata's ring version increments atomic (CASSANDRA-16286)
+
+
+3.0.24:
+ * Prevent unbounded number of pending flushing tasks; Add PendingFlushTasks
metric (CASSANDRA-16261)
+ * Improve empty hint file handling during startup (CASSANDRA-16162)
+ * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
+ * Fix skipping on pre-3.0 created compact storage sstables due to missing
primary key liveness (CASSANDRA-16226)
+ * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
+ * Extend the exclusion of replica filtering protection to other indices
instead of just SASI (CASSANDRA-16311)
+ * Synchronize transaction logs for JBOD (CASSANDRA-16225)
+ * Fix the counting of cells per partition (CASSANDRA-16259)
+ * Fix serial read/non-applying CAS linearizability (CASSANDRA-12126)
+ * Avoid potential NPE in JVMStabilityInspector (CASSANDRA-16294)
+ * Improved check of num_tokens against the length of initial_token
(CASSANDRA-14477)
+ * Fix a race condition on ColumnFamilyStore and TableMetrics
(CASSANDRA-16228)
+ * Remove the SEPExecutor blocking behavior (CASSANDRA-16186)
+ * Wait for schema agreement when bootstrapping (CASSANDRA-15158)
+ * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
+ * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
+Merged from 2.2:
* Remove OpenJDK log warning (CASSANDRA-15563)
* Fix the histogram merge of the table metrics (CASSANDRA-16259)
diff --cc redhat/cassandra.spec
index 2a83b60,73d4a42..bd4cdc9
--- a/redhat/cassandra.spec
+++ b/redhat/cassandra.spec
@@@ -62,10 -64,9 +65,10 @@@ mkdir -p %{buildroot}/usr/bi
mkdir -p %{buildroot}/var/lib/%{username}/commitlog
mkdir -p %{buildroot}/var/lib/%{username}/data
mkdir -p %{buildroot}/var/lib/%{username}/saved_caches
+mkdir -p %{buildroot}/var/lib/%{username}/hints
mkdir -p %{buildroot}/var/run/%{username}
mkdir -p %{buildroot}/var/log/%{username}
- ( cd pylib && python2.7 setup.py install --no-compile --root %{buildroot}; )
+ ( cd pylib && %{__python} setup.py install --no-compile --root %{buildroot}; )
# patches for data and log paths
patch -p1 < debian/patches/001cassandra_yaml_dirs.dpatch
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
