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/98eb8ba5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98eb8ba5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98eb8ba5 Branch: refs/heads/cassandra-2.1 Commit: 98eb8ba52d2210938b575b5a445164835c74dca8 Parents: 19540f0 33cf701 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue May 12 14:39:49 2015 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue May 12 14:39:49 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/98eb8ba5/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
