This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c9e1f42dd683bd3bf3972370e04bd730abb68e4c
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Apr 4 14:40:09 2022 -0500
Add procps Debian dependency
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17516
---
CHANGES.txt | 6 ++++++
debian/control | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 32fdd68552..a354318a59 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
4.0.4
* Clean up schema migration coordinator and tests (CASSANDRA-17533)
* Shut repair task executor down without interruption to avoid compromising
shared channel proxies (CASSANDRA-17466)
@@ -17,6 +18,11 @@
* dropping of a materialized view creates a snapshot with dropped- prefix
(CASSANDRA-17415)
* Validate existence of DCs when repairing (CASSANDRA-17407)
Merged from 3.0:
+=======
+3.0.27
+ * Add procps dependency to RPM/Debian packages (CASSANDRA-17516)
+ * Suppress CVE-2021-44521 (CASSANDRA-17492)
+>>>>>>> 6bdfe13283 (Add procps Debian dependency)
* ConnectionLimitHandler may leaks connection count if remote connection
drops (CASSANDRA-17252)
* Require ant >= 1.10 (CASSANDRA-17428)
* Disallow CONTAINS for UPDATE and DELETE (CASSANDRA-15266)
diff --git a/debian/control b/debian/control
index 0cb71a4da7..1fc3f96d3e 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),
procps, ${misc:Depends}
Recommends: ntp | time-daemon
Suggests: cassandra-tools
Conflicts: apache-cassandra1
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
