You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2019/01/14 18:06:54 UTC
[cassandra] branch cassandra-3.11 updated (6a7aa0f -> 5ede581)
This is an automated email from the ASF dual-hosted git repository.
aleksey pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 6a7aa0f Merge branch 'cassandra-3.0' into cassandra-3.11
new ebfa280 Counters fail to increment in 2.1/2.2 to 3.X mixed version clusters
new 5ede581 Merge branch 'cassandra-3.0' into cassandra-3.11
The 2 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 +
src/java/org/apache/cassandra/db/LegacyLayout.java | 4 ++--
.../org/apache/cassandra/db/context/CounterContext.java | 16 ++++++++--------
3 files changed, 11 insertions(+), 10 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aleksey pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5ede581f5f1f94d04110723157c849c157ab81f4
Merge: 6a7aa0f ebfa280
Author: Aleksey Yeshchenko <al...@apple.com>
AuthorDate: Mon Jan 14 18:04:15 2019 +0000
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/LegacyLayout.java | 4 ++--
.../org/apache/cassandra/db/context/CounterContext.java | 16 ++++++++--------
3 files changed, 11 insertions(+), 10 deletions(-)
diff --cc CHANGES.txt
index a442f11,063e8fb..c72e89d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
-3.0.18
+3.11.4
+ * Make stop-server.bat wait for Cassandra to terminate (CASSANDRA-14829)
+ * Correct sstable sorting for garbagecollect and levelled compaction (CASSANDRA-14870)
+Merged from 3.0:
+ * Counters fail to increment in 2.1/2.2 to 3.X mixed version clusters (CASSANDRA-14958)
* Streaming needs to synchronise access to LifecycleTransaction (CASSANDRA-14554)
* Fix cassandra-stress write hang with default options (CASSANDRA-14616)
* Differentiate between slices and RTs when decoding legacy bounds (CASSANDRA-14919)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org