Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d48ddf2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d48ddf2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d48ddf2 Branch: refs/heads/cassandra-3.0 Commit: 2d48ddf212f72d7f80636dff7d79ee4d30ce6763 Parents: 19ec8dd c947a2c Author: T Jake Luciani <j...@apache.org> Authored: Fri Mar 11 14:24:42 2016 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Fri Mar 11 14:24:42 2016 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/Config.java | 7 ++++--- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d48ddf2/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d48ddf2/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
