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/bbaa9630 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbaa9630 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbaa9630 Branch: refs/heads/trunk Commit: bbaa9630c4be9a9451f69ddd25e045dc2e92c057 Parents: 12e38f7 5a1d376 Author: blerer <benjamin.le...@datastax.com> Authored: Thu Oct 22 10:22:01 2015 +0200 Committer: blerer <benjamin.le...@datastax.com> Committed: Thu Oct 22 10:22:12 2015 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------