Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/972ae147 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/972ae147 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/972ae147 Branch: refs/heads/cassandra-2.1 Commit: 972ae147247a0e4c2bba3a3c2853c2209e93cd95 Parents: 012b987 50e5802 Author: Jonathan Ellis <[email protected]> Authored: Tue Aug 11 16:32:47 2015 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Aug 11 16:32:47 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
