Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc5f1673 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc5f1673 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc5f1673 Branch: refs/heads/trunk Commit: bc5f16736654de4e352a415a6f34bc37120865e0 Parents: 1fe594d 12e38f7 Author: Aleksey Yeschenko <[email protected]> Authored: Wed Oct 21 21:10:21 2015 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Oct 21 21:10:21 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/bc5f1673/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc5f1673/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc5f1673/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
