Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fdec45f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fdec45f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fdec45f7 Branch: refs/heads/trunk Commit: fdec45f7f4a60049db7b6698491d3149637fd913 Parents: 32fe754 fbf9f55 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Dec 7 17:30:14 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Dec 7 17:30:14 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdec45f7/CHANGES.txt ----------------------------------------------------------------------