Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/450091bf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/450091bf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/450091bf Branch: refs/heads/cassandra-2.2 Commit: 450091bfb8ae66cefa26c2738770d435edf3fb5b Parents: af509ec 0d51b65 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Dec 29 13:46:11 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Dec 29 13:46:11 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------