Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b887edf1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b887edf1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b887edf1 Branch: refs/heads/trunk Commit: b887edf1294f82d61b7dc66326af280e448ebafc Parents: 9f85e10 0d68043 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Mar 13 11:43:05 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Mar 13 11:43:05 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b887edf1/CHANGES.txt ----------------------------------------------------------------------
