cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aweisb...@apache.org
Subject [09/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 14 Feb 2018 21:28:47 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08ebe829
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08ebe829
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08ebe829

Branch: refs/heads/cassandra-3.11
Commit: 08ebe8297b0ffbfda522036c0f750c4f6cf67e6f
Parents: 1602e60 4bbd28a
Author: Ariel Weisberg <aweisberg@apple.com>
Authored: Wed Feb 14 13:23:41 2018 -0500
Committer: Ariel Weisberg <aweisberg@apple.com>
Committed: Wed Feb 14 13:23:41 2018 -0500

----------------------------------------------------------------------
 CHANGES.txt | 4 ++++
 NEWS.txt    | 9 +++++++++
 2 files changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/08ebe829/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 82da6ad,0c25388..09930ce
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,7 +1,13 @@@
 -2.1.21
++2.2.13
++Merged from 2.1:
+  * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183)
+ 
 -2.1.20
 +2.2.12
 + * Fix the inspectJvmOptions startup check (CASSANDRA-14112)
 + * Fix race that prevents submitting compaction for a table when executor is full (CASSANDRA-13801)
 + * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006)
 + * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873)
 +Merged from 2.1:
   * Protect against overflow of local expiration time (CASSANDRA-14092)
   * More PEP8 compliance for cqlsh (CASSANDRA-14021)
   * RPM package spec: fix permissions for installed jars and config files (CASSANDRA-14181)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/08ebe829/NEWS.txt
----------------------------------------------------------------------


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


Mime
View raw message