Updated Branches: refs/heads/cassandra-1.2 6bd56cf04 -> 07c6ff1b3 refs/heads/cassandra-1.2.0 ffb2eba6c -> aaf9409f5 refs/heads/trunk a6dd34a0b -> 387b10226
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/387b1022 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/387b1022 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/387b1022 Branch: refs/heads/trunk Commit: 387b10226d885dde467da3697c78299287911d7e Parents: a6dd34a 07c6ff1 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Dec 4 16:19:38 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Dec 4 16:19:38 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/387b1022/CHANGES.txt ----------------------------------------------------------------------
