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/c2bc39f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2bc39f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2bc39f2 Branch: refs/heads/trunk Commit: c2bc39f289794b6803fa8c89c91da857a37436bd Parents: 07782aa 36d0f55 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Oct 7 13:57:28 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Oct 7 13:57:28 2015 +0200 ---------------------------------------------------------------------- conf/cassandra.yaml | 2 +- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 4 ++-- src/java/org/apache/cassandra/dht/BootStrapper.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2bc39f2/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
