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 2022/04/13 12:12:03 UTC
[cassandra] branch cassandra-3.11 updated (d7a9f41cf1 -> cde152cdb7)
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 d7a9f41cf1 Merge branch 'cassandra-3.0' into cassandra-3.11
new 02a7a1cd50 Add procps-ng RPM dependency
new 62798f2143 Add procps Debian dependency
new 39c8d6aa57 Add procps-ng RPM dependency
new 84bc0e8c3b Add procps Debian dependency
new cde152cdb7 Merge branch 'cassandra-3.0' into cassandra-3.11
The 5 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/control | 2 +-
redhat/cassandra.spec | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 02/03: Add procps Debian dependency
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 62798f21436f0fbc0142bb48f9a0d17857c30d8b
Author: Brandon Williams <br...@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 | 1 +
debian/control | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index dcc5caf317..37cf1e563e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@
* Validate existence of DCs when repairing (CASSANDRA-17407)
* dropping of a materialized view creates a snapshot with dropped- prefix (CASSANDRA-17415)
Merged from 3.0:
+ * Add procps dependency to RPM/Debian packages (CASSANDRA-17516)
* Suppress CVE-2021-44521 (CASSANDRA-17492)
* ConnectionLimitHandler may leaks connection count if remote connection drops (CASSANDRA-17252)
* Require ant >= 1.10 (CASSANDRA-17428)
diff --git a/debian/control b/debian/control
index 3d4898d4db..0a8bfd20ad 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, python (>= 2.7) | python2 (>= 2.7), ${misc:Depends}
+Depends: openjdk-8-jre-headless | java8-runtime, adduser, python (>= 2.7) | python2 (>= 2.7), procps, ${misc: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] 01/03: Add procps-ng RPM dependency
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 02a7a1cd50b8f5ba860996afb32da6e38e4a969a
Author: Brandon Williams <br...@apache.org>
AuthorDate: Mon Apr 4 14:39:46 2022 -0500
Add procps-ng RPM dependency
Patch by Dylan Richardson; reviewed by brandonwilliams and bereng for
CASSANDRA-17516
---
redhat/cassandra.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/redhat/cassandra.spec b/redhat/cassandra.spec
index 8c53d44c61..213a791867 100644
--- a/redhat/cassandra.spec
+++ b/redhat/cassandra.spec
@@ -47,6 +47,7 @@ BuildRequires: ant-junit >= 1.9
Requires: jre >= 1.8.0
Requires: python(abi) >= 2.7
+Requires: procps-ng >= 3.3
Requires(pre): user(cassandra)
Requires(pre): group(cassandra)
Requires(pre): shadow-utils
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 03/03: 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 cde152cdb71a2d50ab3a8353bd61ef75d6e31284
Merge: 62798f2143 84bc0e8c3b
Author: Brandon Williams <br...@apache.org>
AuthorDate: Wed Apr 13 07:03:36 2022 -0500
Merge branch 'cassandra-3.0' into cassandra-3.11
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org