Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27943b11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27943b11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27943b11 Branch: refs/heads/trunk Commit: 27943b11770b81d0f94d6d4302cc7f4b76067327 Parents: bcfe352 238139c Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Aug 6 16:55:42 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Aug 6 16:55:42 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------