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/fe62557e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe62557e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe62557e Branch: refs/heads/cassandra-3.0 Commit: fe62557ef3ec9cc7ed653600f627f9fe1e9876c0 Parents: 21191e6 450091b Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Dec 29 13:46:24 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Dec 29 13:46:24 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------