Updated Branches: refs/heads/cassandra-1.1 26c136d30 -> 031e89417 refs/heads/trunk 4e8b92796 -> f4595a791
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/f4595a79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4595a79 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4595a79 Branch: refs/heads/trunk Commit: f4595a7910639b5713d1b8207255f1e127de6457 Parents: 4e8b927 031e894 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Apr 3 11:14:51 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Apr 3 11:14:51 2012 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------