Updated Branches:
refs/heads/cassandra-1.2 82de0ec75 -> 75d0f7a3f
refs/heads/trunk 58db3ce98 -> d216b0d28
Merge branch 'cassandra-1.2' into trunk
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d216b0d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d216b0d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d216b0d2
Branch: refs/heads/trunk
Commit: d216b0d28b82efc42608fc249a6d212152271c14
Parents: 58db3ce 75d0f7a
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Mon Feb 4 13:07:38 2013 -0600
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Mon Feb 4 13:07:38 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d216b0d2/CHANGES.txt
----------------------------------------------------------------------
