Updated Branches: refs/heads/cassandra-1.0 03ad8cdf4 -> 8c9d0fb72 refs/heads/cassandra-1.1.0 03d383358 -> 512946c38 refs/heads/trunk 6204ee870 -> 60fc3aaa4
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60fc3aaa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60fc3aaa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60fc3aaa Branch: refs/heads/trunk Commit: 60fc3aaa4226b2ee2f811e5bcd899b93fccb8a94 Parents: 6204ee8 3373b64 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Apr 18 11:26:09 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Apr 18 11:26:09 2012 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------