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/b621078f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b621078f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b621078f Branch: refs/heads/trunk Commit: b621078f20587573b91ba76ed1309a7c0a91a122 Parents: 82b920b 40f0bdc Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Jul 1 09:12:34 2013 -0700 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Jul 1 09:12:34 2013 -0700 ---------------------------------------------------------------------- ----------------------------------------------------------------------