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/09 23:23:32 UTC
[cassandra] branch cassandra-3.11 updated (67b8504 -> ce075b3)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 67b8504 Merge branch 'cassandra-3.0' into cassandra-3.11
new a895724 Revert "Remove python3:Depends from Debian packaging"
new 8441d88 Revert "Ninja update debian packaging to python3 from python for CASSANDRA-16478"
new 03d79c0 Revert "Update debian packaging to python3"
new ce075b3 Merge branch 'cassandra-3.0' into cassandra-3.11
The 4 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 -
debian/compat | 2 +-
debian/control | 4 ++--
debian/rules | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 02/04: Revert "Ninja update debian packaging to python3
from python for CASSANDRA-16478"
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 8441d88d6dd3458d5520c619e9dc559d8ad6347b
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue Mar 9 17:20:01 2021 -0600
Revert "Ninja update debian packaging to python3 from python for CASSANDRA-16478"
This reverts commit c775ea3fa77bb661f405d8ebba738546518ac18e.
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index b256d98..328502e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
Package: cassandra
Architecture: all
-Depends: openjdk-8-jre-headless | java8-runtime, adduser, python3 (>= 3.6), ${misc:Depends}, ${python3:Depends}
+Depends: openjdk-8-jre-headless | java8-runtime, adduser, python (>= 3.6), ${misc:Depends}, ${python3:Depends}
Recommends: ntp | time-daemon
Suggests: cassandra-tools
Conflicts: apache-cassandra1
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 04/04: Merge branch 'cassandra-3.0' into cassandra-3.11
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ce075b3ee4781a837b70d307a40a512c10eff28e
Merge: 67b8504 03d79c0
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue Mar 9 17:21:02 2021 -0600
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 -
debian/compat | 2 +-
debian/control | 4 ++--
debian/rules | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --cc CHANGES.txt
index cb66874,f1d9bb7..26f07fe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,12 +1,21 @@@
-3.0.25:
+3.11.11
+ * Upgrade jackson-databind to 2.9.10.8 (CASSANDRA-16462)
+Merged from 3.0:
* 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)
+3.11.10
+ * 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)
+ * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
+ * Rate limit validation compactions using compaction_throughput_mb_per_sec (CASSANDRA-16161)
+ * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to default of 1GB (CASSANDRA-16071)
+Merged from 3.0:
+ * Prevent unbounded number of pending flushing tasks (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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/04: Revert "Remove python3:Depends from Debian
packaging"
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a895724c2e5c978372f048ca07f636c0b0fd68d2
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue Mar 9 17:19:49 2021 -0600
Revert "Remove python3:Depends from Debian packaging"
This reverts commit 2022cfe073af0a0ba311c80937e6f5c063412200.
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 8028f5a..b256d98 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
Package: cassandra
Architecture: all
-Depends: openjdk-8-jre-headless | java8-runtime, adduser, python3 (>= 3.6), ${misc:Depends}
+Depends: openjdk-8-jre-headless | java8-runtime, adduser, python3 (>= 3.6), ${misc:Depends}, ${python3:Depends}
Recommends: ntp | time-daemon
Suggests: cassandra-tools
Conflicts: apache-cassandra1
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 03/04: Revert "Update debian packaging to python3"
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 03d79c06d53a7e7f904b8796f5c54730230bcfec
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue Mar 9 17:20:50 2021 -0600
Revert "Update debian packaging to python3"
This reverts commit 8c43f510a3a97977bc499b1b12c350169eb8076f.
---
CHANGES.txt | 1 -
debian/compat | 2 +-
debian/control | 4 ++--
debian/rules | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index c174cd3..f1d9bb7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,5 @@
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:
* Make TokenMetadata's ring version increments atomic (CASSANDRA-16286)
diff --git a/debian/compat b/debian/compat
index b4de394..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-11
+5
diff --git a/debian/control b/debian/control
index 328502e..6a0128e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
Priority: extra
Maintainer: Eric Evans <ee...@apache.org>
Uploaders: Sylvain Lebresne <sl...@apache.org>
-Build-Depends: debhelper (>= 11), openjdk-8-jdk | java8-jdk, ant (>= 1.9), ant-optional (>= 1.9), dh-python, python3-dev (>= 3.6), dpatch, bash-completion
+Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk, ant (>= 1.9), ant-optional (>= 1.9), dh-python, python-dev (>= 2.7), dpatch, bash-completion
Homepage: http://cassandra.apache.org
Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git
@@ -11,7 +11,7 @@ Standards-Version: 3.8.3
Package: cassandra
Architecture: all
-Depends: openjdk-8-jre-headless | java8-runtime, adduser, python (>= 3.6), ${misc:Depends}, ${python3:Depends}
+Depends: openjdk-8-jre-headless | java8-runtime, adduser, python (>= 2.7), ${misc:Depends}
Recommends: ntp | time-daemon
Suggests: cassandra-tools
Conflicts: apache-cassandra1
diff --git a/debian/rules b/debian/rules
index 5acb716..ff1d64d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ build-stamp: patch-stamp
$(ANT) generate-cql-html
$(ANT) jar
- cd pylib && python3 setup.py install --no-compile --install-layout deb \
+ cd pylib && python setup.py install --no-compile --install-layout deb \
--root $(CURDIR)/debian/cassandra
touch build-stamp
@@ -40,7 +40,7 @@ install: build
dh_testroot
dh_installdirs
dh_install
- dh_python3
+ dh_python2
# Copy in the jar and symlink to something stable
dh_install build/apache-cassandra-$(VERSION).jar \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org