Updated Branches: refs/heads/cassandra-1.2 d25182f0d -> 6bd56cf04 refs/heads/cassandra-1.2.0 0d6990167 -> ffb2eba6c refs/heads/trunk bb229f25f -> a6dd34a0b
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/a6dd34a0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6dd34a0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6dd34a0 Branch: refs/heads/trunk Commit: a6dd34a0b9d20c54dafa416bcc5d2765afe3e28d Parents: bb229f2 6bd56cf Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Dec 4 14:56:50 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Dec 4 14:56:50 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 35 ++++++++++------------------------- 1 files changed, 10 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6dd34a0/CHANGES.txt ----------------------------------------------------------------------
