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/fa070551 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa070551 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa070551 Branch: refs/heads/trunk Commit: fa070551e689c15a8551a9aa614ce27b1bf8d5e9 Parents: 38d1fce a9db74b Author: Robert Stupp <sn...@snazy.de> Authored: Fri Oct 9 13:15:08 2015 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Fri Oct 9 13:15:08 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 4 +++- conf/cassandra-env.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa070551/CHANGES.txt ----------------------------------------------------------------------
