Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a125bb06 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a125bb06 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a125bb06 Branch: refs/heads/trunk Commit: a125bb0687e7200dbe9279cf426908928f8b8c32 Parents: ea284ad 07dc6b5 Author: Dave Brosius <[email protected]> Authored: Sat May 17 20:44:21 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Sat May 17 20:44:21 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/a125bb06/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
