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 2021/07/13 15:28:38 UTC

[cassandra] branch cassandra-4.0 updated (906781e -> e0aa365)

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 906781e  Merge branch 'cassandra-3.11' into cassandra-4.0
     new 43b7503  Correct fwd to/from messages for backward compatibility
     new e0aa365  Merge branch 'cassandra-4.0.0' into cassandra-4.0

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/net/ParamType.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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


[cassandra] 02/02: Merge branch 'cassandra-4.0.0' into cassandra-4.0

Posted by br...@apache.org.
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 e0aa3651e2a55446a597c864adf642999f8ed868
Merge: 906781e 43b7503
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue Jul 13 10:27:47 2021 -0500

    Merge branch 'cassandra-4.0.0' into cassandra-4.0

 CHANGES.txt                                      | 1 +
 src/java/org/apache/cassandra/net/ParamType.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --cc CHANGES.txt
index 84db328,48a500c..054e169
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 +4.0.1
 + * Add repaired/unrepaired bytes back to nodetool (CASSANDRA-15282)
 + * Upgrade lz4-java to 1.8.0 to add RH6 support back (CASSANDRA-16753)
 + * Improve DiagnosticEventService.publish(event) logging message of events (CASSANDRA-16749)
 + * Cleanup dependency scopes (CASSANDRA-16704)
 + * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() thread-safe (CASSANDRA-16707)
 +Merged from 3.11:
 + * Make cqlsh use the same set of reserved keywords than the server uses (CASSANDRA-15663)
 + * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
 + * Enable tombstone compactions when unchecked_tombstone_compaction is set in TWCS (CASSANDRA-14496)
 + * Read only the required SSTables for single partition queries (CASSANDRA-16737)
 +Merged from 3.0:
 + * Clean transaction log leftovers at the beginning of sstablelevelreset and sstableofflinerelevel (CASSANDRA-12519)
 +
  4.0.0
+  * Fix fwd to/from headers in DC write forwarding (CASSANDRA-16797)
   * Fix CassandraVersion::compareTo (CASSANDRA-16794)
   * BinLog does not close chronicle queue leaving this to GC to cleanup (CASSANDRA-16774)
  Merged from 3.11:

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


[cassandra] 01/02: Correct fwd to/from messages for backward compatibility

Posted by br...@apache.org.
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 43b750341e2fd33559353d53d059a0cbc3911cb1
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue Jul 13 09:37:05 2021 -0500

    Correct fwd to/from messages for backward compatibility
    
    Patch by brandonwilliams, reviewed by aleksey for CASSANDRA-16797
---
 CHANGES.txt                                      | 1 +
 src/java/org/apache/cassandra/net/ParamType.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d8595ef..48a500c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0.0
+ * Fix fwd to/from headers in DC write forwarding (CASSANDRA-16797)
  * Fix CassandraVersion::compareTo (CASSANDRA-16794)
  * BinLog does not close chronicle queue leaving this to GC to cleanup (CASSANDRA-16774)
 Merged from 3.11:
diff --git a/src/java/org/apache/cassandra/net/ParamType.java b/src/java/org/apache/cassandra/net/ParamType.java
index 6572348..d82689d 100644
--- a/src/java/org/apache/cassandra/net/ParamType.java
+++ b/src/java/org/apache/cassandra/net/ParamType.java
@@ -41,8 +41,8 @@ import static org.apache.cassandra.locator.InetAddressAndPort.Serializer.inetAdd
  */
 public enum ParamType
 {
-    FORWARD_TO          (0, "FORWARD_TO",    ForwardingInfo.serializer),
-    RESPOND_TO          (1, "FORWARD_FROM",  inetAddressAndPortSerializer),
+    FORWARD_TO          (0, "FWD_TO",        ForwardingInfo.serializer),
+    RESPOND_TO          (1, "FWD_FRM",       inetAddressAndPortSerializer),
 
     @Deprecated
     FAILURE_RESPONSE    (2, "FAIL",          LegacyFlag.serializer),

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