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/f85a20f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f85a20f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f85a20f7 Branch: refs/heads/trunk Commit: f85a20f7987814c7c6ca77acdb97587172c2a8ce Parents: 7f4b5e3 97a43ff Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Apr 19 15:48:59 2016 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Apr 19 15:48:59 2016 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------