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/e240e515 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e240e515 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e240e515 Branch: refs/heads/trunk Commit: e240e515fd1b79512904e66a6f3bfe225eca8b92 Parents: 2d0cae4 f9dbc10 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Jul 15 16:21:00 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Jul 15 16:21:00 2014 -0500 ---------------------------------------------------------------------- .../cassandra/config/DatabaseDescriptor.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e240e515/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
