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/3bc585d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bc585d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3bc585d5 Branch: refs/heads/cassandra-3.0 Commit: 3bc585d5d0e01dd4f855994add67d3d120857eec Parents: 0828e24 0d2f403 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Aug 31 12:04:44 2015 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Aug 31 12:04:44 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/3bc585d5/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
