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/36a1ea8e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36a1ea8e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36a1ea8e Branch: refs/heads/cassandra-1.1 Commit: 36a1ea8e550df6abba445e32eb4ed7443488fd66 Parents: 9252ee9 d361ed2 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Mar 27 09:52:21 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Mar 27 09:52:21 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36a1ea8e/CHANGES.txt ----------------------------------------------------------------------