Updated Branches: refs/heads/cassandra-1.1 9f85e1050 -> b887edf12 refs/heads/cassandra-1.1.0 1cdad6385 -> 0d68043a7 refs/heads/trunk 79c34b4f5 -> f0ab6ac05
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/f0ab6ac0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0ab6ac0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0ab6ac0 Branch: refs/heads/trunk Commit: f0ab6ac054db45235c42f6a560e731aeaa73a068 Parents: 79c34b4 b887edf Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Mar 13 11:43:15 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Mar 13 11:43:15 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0ab6ac0/CHANGES.txt ----------------------------------------------------------------------
