Updated Branches: refs/heads/cassandra-1.1 087644b6c -> 684919307 refs/heads/cassandra-1.1.0 97d4c1cfe -> 09ad083ab refs/heads/trunk d765b246e -> 51a658d22
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/51a658d2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51a658d2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51a658d2 Branch: refs/heads/trunk Commit: 51a658d227eddd785ba5154aa1e336dc7f7662f8 Parents: d765b24 6849193 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Mar 16 19:41:50 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Mar 16 19:41:50 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/51a658d2/CHANGES.txt ----------------------------------------------------------------------
