Merge branch 'cassandra-1.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/8c795372 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c795372 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c795372 Branch: refs/heads/trunk Commit: 8c795372c929b97b7c5a5fda5e4de8bcc0810415 Parents: 968f647 1a49425 Author: Jonathan Ellis <[email protected]> Authored: Tue Jul 30 16:04:00 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Jul 30 16:04:00 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
