Add cassandra.auto_bootstrap system property patch by Joe Hohertz; reviewed by jbellis for CASSANDRA-7650
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a21e655e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a21e655e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a21e655e Branch: refs/heads/cassandra-2.1 Commit: a21e655ebd4f7d63926f00ce6b2a86390c35dfb9 Parents: 7fa93a2 Author: Jonathan Ellis <[email protected]> Authored: Wed Aug 6 12:41:46 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Aug 6 12:41:46 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a21e655e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 49cb6a1..fdff490 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.10 + * Add cassandra.auto_bootstrap system property (CASSANDRA-7650) * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570) * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a21e655e/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 1ca7975..7987193 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -1138,7 +1138,7 @@ public class DatabaseDescriptor public static boolean isAutoBootstrap() { - return conf.auto_bootstrap; + return Boolean.parseBoolean(System.getProperty("cassandra.auto_bootstrap", conf.auto_bootstrap.toString())); } public static void setHintedHandoffEnabled(boolean hintedHandoffEnabled)
