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/12fd5d27 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12fd5d27 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12fd5d27 Branch: refs/heads/trunk Commit: 12fd5d270a8de2bcf34b082b410448eba02be4c4 Parents: 2753f95 d09b6c6 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Nov 18 14:00:02 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Nov 18 14:00:02 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------