Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3671082b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3671082b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3671082b Branch: refs/heads/trunk Commit: 3671082b037c05979740c9bc5a4ee3a4a4425bf7 Parents: 6739434 02a7c34 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Sun Jun 28 11:40:00 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Sun Jun 28 11:40:00 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------