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/319157d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/319157d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/319157d9 Branch: refs/heads/trunk Commit: 319157d94ca60873f6ddb9794da1175586829724 Parents: 345be20 0c051a4 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Mon Oct 12 15:13:30 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Mon Oct 12 15:13:30 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------