cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [2/3] git commit: Fix backward VV serialization of the LEFT state
Date Wed, 26 Jun 2013 20:57:17 GMT
Fix backward VV serialization of the LEFT state


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

Branch: refs/heads/trunk
Commit: 54266ea705b20e12a6f03dab69fa5d6b05e160a7
Parents: b97b490
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Jun 26 15:52:43 2013 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Jun 26 15:52:43 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                           |  3 +++
 NEWS.txt                                              | 10 ++++++++++
 src/java/org/apache/cassandra/gms/VersionedValue.java |  4 ++--
 3 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/54266ea7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2931916..cb3fede 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+1.2.7
+ * Fix serialization of the LEFT gossip value (CASSANDRA-5696)
+
 1.2.6
  * Fix tracing when operation completes before all responses arrive (CASSANDRA-5668)
  * Fix cross-DC mutation forwarding (CASSANDRA-5632)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/54266ea7/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index cb40981..d4d127b 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,6 +13,16 @@ restore snapshots created with the previous major version using the
 'sstableloader' tool. You can upgrade the file format of your snapshots
 using the provided 'sstableupgrade' tool.
 
+1.2.7
+=====
+Upgrading
+---------
+    - If you have decommissioned a node in the past 72 hours, it is imperative
+      that you not upgrade until such time has passed, or do a full cluster
+      restart (not rolling) before beginning the upgrade.  This only applies to
+      decommission, not removetoken.
+
+
 1.2.6
 =====
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/54266ea7/src/java/org/apache/cassandra/gms/VersionedValue.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/VersionedValue.java b/src/java/org/apache/cassandra/gms/VersionedValue.java
index 5841c4b..60459c8 100644
--- a/src/java/org/apache/cassandra/gms/VersionedValue.java
+++ b/src/java/org/apache/cassandra/gms/VersionedValue.java
@@ -148,8 +148,8 @@ public class VersionedValue implements Comparable<VersionedValue>
         public VersionedValue left(Collection<Token> tokens, long expireTime)
         {
             return new VersionedValue(versionString(VersionedValue.STATUS_LEFT,
-                    Long.toString(expireTime),
-                    makeTokenString(tokens)));
+                    makeTokenString(tokens),
+                    Long.toString(expireTime)));
         }
 
         public VersionedValue moving(Token token)


Mime
View raw message