Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d0c6ef7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d0c6ef7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d0c6ef7 Branch: refs/heads/trunk Commit: 5d0c6ef77461b6b6b488be445c22062e0aa9b936 Parents: ae7afb7 3bc585d Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Aug 31 12:04:51 2015 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Aug 31 12:04:51 2015 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/config/DatabaseDescriptor.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d0c6ef7/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
