You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2020/10/23 08:44:33 UTC
[cassandra] branch cassandra-3.11 updated (efd6b60 -> 06ecdfa)
This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from efd6b60 Merge branch 'cassandra-3.0' into cassandra-3.11
new 1260445 Avoid marking shutting down nodes as up after receiving gossip shutdown message
new 06ecdfa 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 +
.../apache/cassandra/service/EchoVerbHandler.java | 14 ++-
.../apache/cassandra/service/StorageService.java | 9 ++
.../distributed/test/GossipShutdownTest.java | 135 +++++++++++++++++++++
4 files changed, 155 insertions(+), 4 deletions(-)
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/GossipShutdownTest.java
---------------------------------------------------------------------
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 ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 06ecdfaae604ea260b4ddf48a3ef003becd1b3f4
Merge: efd6b60 1260445
Author: Marcus Eriksson <ma...@apache.org>
AuthorDate: Fri Oct 23 10:22:24 2020 +0200
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
.../apache/cassandra/service/EchoVerbHandler.java | 14 ++-
.../apache/cassandra/service/StorageService.java | 9 ++
.../distributed/test/GossipShutdownTest.java | 135 +++++++++++++++++++++
4 files changed, 155 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index af44f96,dfb4c4a..d04a1e5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,9 +1,14 @@@
-3.0.23:
+3.11.9
+ * Synchronize Keyspace instance store/clear (CASSANDRA-16210)
+ * Fix ColumnFilter to avoid querying cells of unselected complex columns (CASSANDRA-15977)
+ * Fix memory leak in CompressedChunkReader (CASSANDRA-15880)
+ * Don't attempt value skipping with mixed version cluster (CASSANDRA-15833)
+ * Avoid failing compactions with very large partitions (CASSANDRA-15164)
+ * Make sure LCS handles duplicate sstable added/removed notifications correctly (CASSANDRA-14103)
+Merged from 3.0:
+ * Avoid marking shutting down nodes as up after receiving gossip shutdown message (CASSANDRA-16094)
* Check SSTables for latest version before dropping compact storage (CASSANDRA-16063)
* Handle unexpected columns due to schema races (CASSANDRA-15899)
- * Avoid failing compactions with very large partitions (CASSANDRA-15164)
- * Use IF NOT EXISTS for index and UDT create statements in snapshot schema files (CASSANDRA-13935)
* Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160)
Merged from 2.2:
* Package tools/bin scripts as executable (CASSANDRA-16151)
diff --cc src/java/org/apache/cassandra/service/EchoVerbHandler.java
index d0c435e,16a5a70..5410837
--- a/src/java/org/apache/cassandra/service/EchoVerbHandler.java
+++ b/src/java/org/apache/cassandra/service/EchoVerbHandler.java
@@@ -17,10 -17,9 +17,9 @@@ package org.apache.cassandra.service
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
-
import org.apache.cassandra.gms.EchoMessage;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.MessageIn;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org