Updated Branches: refs/heads/trunk 4f5ea3452 -> 725251c3b
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/725251c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/725251c3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/725251c3 Branch: refs/heads/trunk Commit: 725251c3b0d3e6386564cb71de144154566ea4fd Parents: 4f5ea34 9418c2a Author: Peter Schuller <peter.schul...@infidyne.com> Authored: Mon Mar 5 22:07:35 2012 -0800 Committer: Peter Schuller <peter.schul...@infidyne.com> Committed: Mon Mar 5 22:07:35 2012 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
