Updated Branches: refs/heads/cassandra-1.1 0183dc0b3 -> e5be9520b refs/heads/trunk 6feb729c8 -> 7bc09f927
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/7bc09f92 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bc09f92 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bc09f92 Branch: refs/heads/trunk Commit: 7bc09f9279e280b4e09e4e55e1c34b09b8f93dc4 Parents: 6feb729 e5be952 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Feb 9 15:38:31 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Feb 9 15:38:31 2012 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
