Merge branch 'cassandra-2.0' into cassandra-2.1
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/de0cb797
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de0cb797
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de0cb797
Branch: refs/heads/trunk
Commit: de0cb7972153cc6d2b855d181cd1ff6cf64736fa
Parents: bb1deac 999bee7
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Wed May 28 14:39:54 2014 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Wed May 28 14:39:54 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
