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/07782aa4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07782aa4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07782aa4 Branch: refs/heads/trunk Commit: 07782aa4a525e251cb0f8ac6f6d27145066cf0ea Parents: 587fe51 566799f Author: Sylvain Lebresne <[email protected]> Authored: Wed Oct 7 10:48:48 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Oct 7 10:48:48 2015 +0200 ---------------------------------------------------------------------- NEWS.txt | 2 ++ conf/cassandra.yaml | 1 - src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 ++- test/conf/cassandra_pig.yaml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/07782aa4/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
