cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Thu, 12 Jun 2014 19:46:35 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

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/daf6f68e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/daf6f68e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/daf6f68e

Branch: refs/heads/cassandra-2.0
Commit: daf6f68ec4fb6536204f23e6855f2befb21f47af
Parents: b48a17b 29a89d8
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Thu Jun 12 14:45:44 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Thu Jun 12 14:45:44 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                             |  2 ++
 .../org/apache/cassandra/config/DatabaseDescriptor.java | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/daf6f68e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 94e2c5a,f37eda4..a2a978e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,23 @@@
 +2.0.9
 + * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Add per-CF range read request latency metrics (CASSANDRA-7338)
 + * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 + * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 + * Swap local and global default read repair chances (CASSANDRA-7320)
 + * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 + * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 + * Add authentication support to shuffle (CASSANDRA-6484)
 + * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325)
 + * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
 + * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 + * Reference sstables before populating key cache (CASSANDRA-7234)
 +Merged from 1.2:
+ 1.2.17
+  * Add replace_address_first_boot flag to only replace if not bootstrapped (CASSANDRA-7356)
   * Enable keepalive for native protocol (CASSANDRA-7380)
   * Check internal addresses for seeds (CASSANDRA-6523)
   * Fix potential / by 0 in HHOM page size calculation (CASSANDRA-7354)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/daf6f68e/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index a368cdb,3c58b57..f3e634a
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -717,6 -772,13 +718,13 @@@ public class DatabaseDescripto
  
      public static boolean isReplacing()
      {
 -        if (System.getProperty("cassandra.replace_address_first_boot", null) != null &&
SystemTable.bootstrapComplete())
++        if (System.getProperty("cassandra.replace_address_first_boot", null) != null &&
SystemKeyspace.bootstrapComplete())
+         {
+             logger.info("Replace address on first boot requested; this node is already bootstrapped");
+             return false;
+         }
 -        if (getReplaceAddress() != null && SystemTable.bootstrapComplete())
++        if (getReplaceAddress() != null && SystemKeyspace.bootstrapComplete())
+             throw new RuntimeException("Cannot replace address with a node that is already
bootstrapped");
          return getReplaceAddress() != null;
      }
  


Mime
View raw message