merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d599b3fc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d599b3fc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d599b3fc Branch: refs/heads/cassandra-1.2.0 Commit: d599b3fc80292620043191cbe5a280630207f78e Parents: 8f7754d f618369 Author: Jonathan Ellis <[email protected]> Authored: Fri Dec 7 16:55:48 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Dec 7 16:55:48 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d599b3fc/CHANGES.txt ----------------------------------------------------------------------
