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/c8440810 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8440810 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8440810 Branch: refs/heads/trunk Commit: c8440810903cd20da2493ca4bee5b329e32e6f06 Parents: 8a91a1a 60be742 Author: Tyler Hobbs <ty...@datastax.com> Authored: Thu Jun 5 15:40:10 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Thu Jun 5 15:40:10 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 10 ++++ bin/cassandra | 1 + bin/cassandra.bat | 1 + bin/cassandra.ps1 | 4 ++ conf/cassandra.yaml | 11 ++-- conf/logback.xml | 4 +- debian/control | 2 +- debian/patches/001cassandra_yaml_dirs.dpatch | 36 ++++++++++++ debian/patches/00list | 1 + debian/rules | 6 +- .../cassandra/config/DatabaseDescriptor.java | 60 ++++++++++++-------- 12 files changed, 104 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8440810/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8440810/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8440810/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
