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/05d27ea2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05d27ea2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05d27ea2 Branch: refs/heads/trunk Commit: 05d27ea27e2f8f2e76b5ff104d30871b8264261d Parents: ec4b1fe 5c28958 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Jul 31 19:22:41 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Jul 31 19:22:41 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------