You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2015/04/13 20:35:46 UTC
cassandra git commit: Allow Cassandra config to be updated to restart
Daemon without unloading classes
Repository: cassandra
Updated Branches:
refs/heads/trunk d19a6af66 -> 4a3ca5c70
Allow Cassandra config to be updated to restart Daemon without unloading classes
Patch by Emmanuel Hugonnet, reviewed by aweisberg for CASSANDRA-9046
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a3ca5c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a3ca5c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a3ca5c7
Branch: refs/heads/trunk
Commit: 4a3ca5c70e94d6b9329b7289f61ffbe708828ebf
Parents: d19a6af
Author: Brandon Williams <br...@apache.org>
Authored: Mon Apr 13 13:34:31 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Apr 13 13:34:31 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 2 +-
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a3ca5c7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d6e8f57..9f89e3f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0
+ * Allow cassandra config to be updated to restart daemon without unloading classes (CASSANDRA-9046)
* Don't initialize compaction writer before checking if iter is empty (CASSANDRA-9117)
* Remove line number generation from default logback.xml
* Don't execute any functions at prepare-time (CASSANDRA-9037)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a3ca5c7/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 047f9a8..c2c60f3 100644
--- a/build.xml
+++ b/build.xml
@@ -326,7 +326,7 @@
<dependency groupId="commons-codec" artifactId="commons-codec" version="1.2"/>
<dependency groupId="org.apache.commons" artifactId="commons-lang3" version="3.1"/>
<dependency groupId="org.apache.commons" artifactId="commons-math3" version="3.2"/>
- <dependency groupId="com.googlecode.concurrentlinkedhashmap" artifactId="concurrentlinkedhashmap-lru" version="1.3"/>
+ <dependency groupId="com.googlecode.concurrentlinkedhashmap" artifactId="concurrentlinkedhashmap-lru" version="1.4"/>
<dependency groupId="org.antlr" artifactId="antlr" version="3.5.2">
<exclusion groupId="org.antlr" artifactId="stringtemplate"/>
</dependency>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a3ca5c7/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 781dcfa..fd1faeb 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -254,7 +254,7 @@ public class DatabaseDescriptor
}
}
- private static void applyConfig(Config config) throws ConfigurationException
+ public static void applyConfig(Config config) throws ConfigurationException
{
conf = config;