Updated Branches: refs/heads/cassandra-1.2 aa9a6029d -> b475602be refs/heads/trunk 85d9ce1ba -> 55aefb007
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55aefb00 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55aefb00 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55aefb00 Branch: refs/heads/trunk Commit: 55aefb0077c64fdae138e9d0b854a10475391de6 Parents: 85d9ce1 b475602 Author: Jonathan Ellis <[email protected]> Authored: Tue Dec 4 14:34:15 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Tue Dec 4 14:34:15 2012 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
