Updated Branches: refs/heads/cassandra-1.0 48438ffc6 -> 641b021d3 refs/heads/cassandra-1.1 7c2e49e22 -> 500c1c01c refs/heads/trunk c553d608f -> 3fd08ddfb
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/3fd08ddf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3fd08ddf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3fd08ddf Branch: refs/heads/trunk Commit: 3fd08ddfb996d4702f42a614970fcf6b65f1f377 Parents: c553d60 500c1c0 Author: Jonathan Ellis <[email protected]> Authored: Mon May 21 11:52:15 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon May 21 11:52:15 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fd08ddf/CHANGES.txt ----------------------------------------------------------------------
