Updated Branches: refs/heads/cassandra-1.1 d909fb4fa -> f32110c6c refs/heads/trunk 0507dbe1c -> 41175282d
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/41175282 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41175282 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41175282 Branch: refs/heads/trunk Commit: 41175282dee8ef6dfae72eba364b91efbbf99caf Parents: 0507dbe f32110c Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Nov 7 11:49:20 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Nov 7 11:49:20 2012 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------