Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05caec77 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05caec77 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05caec77 Branch: refs/heads/trunk Commit: 05caec77c764225f40de0b4e28707344a47ae561 Parents: d1ca745 3d57428 Author: Jonathan Ellis <[email protected]> Authored: Fri Aug 28 17:07:03 2015 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Aug 28 17:07:03 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 + NEWS.txt | 12 ++++ conf/cassandra.yaml | 4 +- .../cassandra/config/DatabaseDescriptor.java | 72 +++++++++++++++++++- 4 files changed, 87 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/05caec77/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/05caec77/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
