Updated Branches: refs/heads/cassandra-1.1 02672936f -> eef779635 refs/heads/trunk 5f1d7b06b -> 0848844e2
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/0848844e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0848844e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0848844e Branch: refs/heads/trunk Commit: 0848844e28fb77a35c40c9cb81e03e62a2d8ec35 Parents: 5f1d7b0 eef7796 Author: Jonathan Ellis <[email protected]> Authored: Mon May 21 17:15:56 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon May 21 17:15:56 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0848844e/CHANGES.txt ----------------------------------------------------------------------
