Updated Branches: refs/heads/trunk d080f6f10 -> ca5318d37
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/ca5318d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca5318d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca5318d3 Branch: refs/heads/trunk Commit: ca5318d37d352a4422fcc23008b4c839ea43e58c Parents: d080f6f 8227f43 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jul 27 12:08:07 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jul 27 12:08:07 2012 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------