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/07c6ff1b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07c6ff1b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07c6ff1b Branch: refs/heads/cassandra-1.2 Commit: 07c6ff1b3a288a186cfb813d0c5d80ca14751233 Parents: 6bd56cf aaf9409 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Dec 4 16:19:31 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Dec 4 16:19:31 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/07c6ff1b/CHANGES.txt ----------------------------------------------------------------------
