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/c1ae9d09 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1ae9d09 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1ae9d09 Branch: refs/heads/cassandra-3.3 Commit: c1ae9d095c9fc8ccc277b04a8aff6b1328294571 Parents: fa2fa60 3b794f0 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Jan 29 08:13:33 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Jan 29 08:13:33 2016 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------
