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/682812d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/682812d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/682812d1 Branch: refs/heads/trunk Commit: 682812d1f831c45546b8bf5c4cd39c2b664c70c9 Parents: 414c1c5 c1ae9d0 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Jan 29 08:13:41 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Jan 29 08:13:41 2016 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------