Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3373b64c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3373b64c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3373b64c Branch: refs/heads/trunk Commit: 3373b64c30f8498d61f605599d148c26c8e60359 Parents: 57de08a 512946c Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Apr 18 11:25:50 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Apr 18 11:25:50 2012 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
