Updated Branches: refs/heads/cassandra-1.1 2f41a32d3 -> ec242b7fc refs/heads/trunk 60fc3aaa4 -> bd7b20933
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/bd7b2093 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd7b2093 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd7b2093 Branch: refs/heads/trunk Commit: bd7b20933f2a02284281c2249d3efb50d4efd518 Parents: 60fc3aa ec242b7 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Apr 18 11:26:58 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Apr 18 11:26:58 2012 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
