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/a252e3f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a252e3f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a252e3f7 Branch: refs/heads/trunk Commit: a252e3f770a372e2e7f860ca199f5c2e3f1713ad Parents: e4467a0 bc5f167 Author: Aleksey Yeschenko <[email protected]> Authored: Wed Oct 21 21:10:47 2015 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Oct 21 21:10:47 2015 +0100 ---------------------------------------------------------------------- NEWS.txt | 4 ++-- conf/cassandra.yaml | 2 +- src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a252e3f7/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
