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/6a9e6d59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a9e6d59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a9e6d59 Branch: refs/heads/trunk Commit: 6a9e6d598d92a7e9d2e1aca63cea6ead16115d19 Parents: deac4cc 56e0ad1 Author: Jonathan Ellis <[email protected]> Authored: Thu Jun 6 14:18:50 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jun 6 14:18:50 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
