You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/08/03 14:06:33 UTC
[1/3] cassandra git commit: Cannot replace token does not exist - DN
node removed as Fat Client
Repository: cassandra
Updated Branches:
refs/heads/trunk 6aa7d6ce8 -> 4d39d4d54
Cannot replace token does not exist - DN node removed as Fat Client
patch by Stefania, reviewed by jasobrown for CASSANDRA-9871
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f9ca07e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f9ca07e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f9ca07e
Branch: refs/heads/trunk
Commit: 8f9ca07e9a0140d93224bf941fa4f6315e5093cf
Parents: 0a4728f
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Aug 3 05:03:42 2015 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Aug 3 05:03:42 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f9ca07e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5cfc347..f4e1832 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.9
+ * Cannot replace token does not exist - DN node removed as Fat Client (CASSANDRA-9871)
* Fix handling of enable/disable autocompaction (CASSANDRA-9899)
* Commit log segment recycling is disabled by default (CASSANDRA-9896)
* Add consistency level to tracing ouput (CASSANDRA-9827)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f9ca07e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 5ffcc53..56ddd63 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1488,6 +1488,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
handleStateBootstrap(endpoint);
break;
case VersionedValue.STATUS_NORMAL:
+ case VersionedValue.SHUTDOWN:
handleStateNormal(endpoint);
break;
case VersionedValue.REMOVING_TOKEN:
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/830137f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/830137f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/830137f1
Branch: refs/heads/trunk
Commit: 830137f1a8e67b3995caaca9bb6f1da8edb234a8
Parents: 16bc74a 8f9ca07
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Aug 3 05:05:47 2015 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Aug 3 05:05:47 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/830137f1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 467b2d7,f4e1832..9317659
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,8 +1,26 @@@
-2.1.9
+2.2.1
+ * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
+ * UDF / UDA execution time in trace (CASSANDRA-9723)
+ * Fix broken internode SSL (CASSANDRA-9884)
+Merged from 2.1:
+ * Cannot replace token does not exist - DN node removed as Fat Client (CASSANDRA-9871)
* Fix handling of enable/disable autocompaction (CASSANDRA-9899)
- * Commit log segment recycling is disabled by default (CASSANDRA-9896)
* Add consistency level to tracing ouput (CASSANDRA-9827)
+ * Remove repair snapshot leftover on startup (CASSANDRA-7357)
+ * Use random nodes for batch log when only 2 racks (CASSANDRA-8735)
+ * Ensure atomicity inside thrift and stream session (CASSANDRA-7757)
+Merged from 2.0:
+ * Log when messages are dropped due to cross_node_timeout (CASSANDRA-9793)
+ * Don't track hotness when opening from snapshot for validation (CASSANDRA-9382)
+
+
+2.2.0
+ * Allow the selection of columns together with aggregates (CASSANDRA-9767)
+ * Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795)
+ * Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797)
+ * sum() and avg() functions missing for smallint and tinyint types (CASSANDRA-9671)
+ * Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
+Merged from 2.1:
* Fix MarshalException when upgrading superColumn family (CASSANDRA-9582)
* Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
* Handle corrupt files on startup (CASSANDRA-9686)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/830137f1/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d39d4d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d39d4d5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d39d4d5
Branch: refs/heads/trunk
Commit: 4d39d4d54eaa96c19bbd3e09f9ddf68e35c8579e
Parents: 6aa7d6c 830137f
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Aug 3 05:06:18 2015 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Aug 3 05:06:18 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d39d4d5/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d39d4d5/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------