Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07dc6b5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07dc6b5c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07dc6b5c Branch: refs/heads/trunk Commit: 07dc6b5cc945c6e59e90782c28ae6ae7cd6a82ed Parents: 4ad6db3 58dc488 Author: Dave Brosius <[email protected]> Authored: Sat May 17 20:43:50 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Sat May 17 20:43:50 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/07dc6b5c/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
