Updated Branches: refs/heads/cassandra-1.1.0 54729ad2c -> 762b45597 refs/heads/trunk 92606cadb -> a14f08b5f
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/a14f08b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a14f08b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a14f08b5 Branch: refs/heads/trunk Commit: a14f08b5fb5503b9353f7814096dfb496fa7384d Parents: 92606ca 3faff1a Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Apr 18 11:38:19 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Apr 18 11:38:19 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ NEWS.txt | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a14f08b5/CHANGES.txt ----------------------------------------------------------------------