merge from 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3faff1ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3faff1ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3faff1ae Branch: refs/heads/trunk Commit: 3faff1ae6e285fb1495b0fa083f3ecbbca9ed054 Parents: ec242b7 762b455 Author: Jonathan Ellis <[email protected]> Authored: Wed Apr 18 11:38:05 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Apr 18 11:38:05 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/3faff1ae/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3faff1ae/NEWS.txt ----------------------------------------------------------------------
