Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af85f232 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af85f232 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af85f232 Branch: refs/heads/cassandra-2.0.0 Commit: af85f2327c0de134bb3cae84f6b09d811b774579 Parents: 3d95cad 27943b1 Author: Jonathan Ellis <[email protected]> Authored: Tue Aug 6 16:55:53 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Aug 6 16:55:53 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
