Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05a6f266 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05a6f266 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05a6f266 Branch: refs/heads/trunk Commit: 05a6f2667d368fd551c6b0803619cfc5e762ac19 Parents: b7563f8 97d65d6 Author: Benedict Elliott Smith <[email protected]> Authored: Tue Mar 10 17:13:56 2015 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Tue Mar 10 17:13:56 2015 +0000 ---------------------------------------------------------------------- ----------------------------------------------------------------------
