Merge branch 'cassandra-3.0' into trunk Conflicts: src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e66e97c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e66e97c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e66e97c Branch: refs/heads/trunk Commit: 1e66e97ca7d08344819b1c8c17935870906f52c4 Parents: 8607900 00264e8 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Sep 11 13:14:12 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Sep 11 13:14:12 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 2 ++ conf/cassandra.yaml | 5 +++++ src/java/org/apache/cassandra/config/Config.java | 2 ++ .../apache/cassandra/config/DatabaseDescriptor.java | 10 ++++++++++ .../org/apache/cassandra/service/GCInspector.java | 16 +++++++++++----- 6 files changed, 31 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e66e97c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e66e97c/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e66e97c/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 43439e7,ed220b8..cd2b888 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@@ -1936,14 -1935,9 +1941,19 @@@ public class DatabaseDescripto conf.user_function_timeout_policy = userFunctionTimeoutPolicy; } + public static EncryptionContext getEncryptionContext() + { + return encryptionContext; + } ++ + public static long getGCWarnThreshold() + { + return conf.gc_warn_threshold_in_ms; + } + @VisibleForTesting + public static void setEncryptionContext(EncryptionContext ec) + { + encryptionContext = ec; + } }