Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7138f15 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7138f15 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7138f15 Branch: refs/heads/cassandra-3.1 Commit: d7138f15119d15404c8149ab95430fcdd1f83cfd Parents: 36019ab d1c3c67 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Nov 20 12:04:30 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Nov 20 12:04:30 2015 +0100 ---------------------------------------------------------------------- NEWS.txt | 4 ++++ 1 file changed, 4 insertions(+) ----------------------------------------------------------------------