Merge branch 'cassandra-2.0' 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/67101c29
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67101c29
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67101c29
Branch: refs/heads/trunk
Commit: 67101c29c95984e4e34d5a7c5d71246ad79da2bc
Parents: afd6368 80cebec
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Tue Feb 11 17:15:27 2014 -0600
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Tue Feb 11 17:15:27 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
