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/07/08 23:13:29 UTC
[1/2] cassandra git commit: Can't transition from write survey to
normal mode
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 89d81345f -> c4b52603f
Can't transition from write survey to normal mode
patch by jasobrown; reviewed by driftx for CASSANDRA-9740
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52dbc3f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52dbc3f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52dbc3f1
Branch: refs/heads/cassandra-2.1
Commit: 52dbc3f1ba7a97654c305f4f9c4af008b450e9b0
Parents: 7cebd0e
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Jul 8 14:11:12 2015 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Jul 8 14:11:12 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52dbc3f1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 27c26b0..84d562c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.17
+ * Can't transition from write survey to normal mode (CASSANDRA-9740)
* Avoid NPE in AuthSuccess#decode (CASSANDRA-9727)
* Add listen_address to system.local (CASSANDRA-9603)
* Bug fixes to resultset metadata construction (CASSANDRA-9636)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52dbc3f1/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 62b0c75..a256ce7 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -907,7 +907,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public boolean isJoined()
{
- return joined;
+ return joined && !isSurveyMode;
}
public void rebuild(String sourceDc)
[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by ja...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
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/c4b52603
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4b52603
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c4b52603
Branch: refs/heads/cassandra-2.1
Commit: c4b52603fb4f9bb78019ec3e018871f389960df2
Parents: 89d8134 52dbc3f
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Jul 8 14:13:12 2015 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Jul 8 14:13:12 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4b52603/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 568571d,84d562c..7635227
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
-2.0.17
+2.1.9
+ * Fix clientutil jar and tests (CASSANDRA-9760)
+ * (cqlsh) Allow the SSL protocol version to be specified through the
+ config file or environment variables (CASSANDRA-9544)
+Merged from 2.0:
+ * Can't transition from write survey to normal mode (CASSANDRA-9740)
+ * Scrub (recover) sstables even when -Index.db is missing, (CASSANDRA-9591)
+ * Fix growing pending background compaction (CASSANDRA-9662)
+
+
+2.1.8
+ * (cqlsh) Fix bad check for CQL compatibility when DESCRIBE'ing
+ COMPACT STORAGE tables with no clustering columns
+ * Warn when an extra-large partition is compacted (CASSANDRA-9643)
+ * Eliminate strong self-reference chains in sstable ref tidiers (CASSANDRA-9656)
+ * Ensure StreamSession uses canonical sstable reader instances (CASSANDRA-9700)
+ * Ensure memtable book keeping is not corrupted in the event we shrink usage (CASSANDRA-9681)
+ * Update internal python driver for cqlsh (CASSANDRA-9064)
+ * Fix IndexOutOfBoundsException when inserting tuple with too many
+ elements using the string literal notation (CASSANDRA-9559)
+ * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
+ * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
+ * Enable describe on indices (CASSANDRA-7814)
+ * ColumnFamilyStore.selectAndReference may block during compaction (CASSANDRA-9637)
+Merged from 2.0:
* Avoid NPE in AuthSuccess#decode (CASSANDRA-9727)
* Add listen_address to system.local (CASSANDRA-9603)
* Bug fixes to resultset metadata construction (CASSANDRA-9636)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4b52603/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------