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/f6695884 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6695884 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6695884 Branch: refs/heads/cassandra-3.0 Commit: f6695884e212ad8af3a2e389d3dd5cf9396dfc43 Parents: 5335960 dae2045 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Sep 7 08:06:55 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Sep 7 08:06:55 2015 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------