Merge branch 'cassandra-2.0' into cassandra-2.1.0
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/3e807b65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e807b65
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e807b65
Branch: refs/heads/cassandra-2.1.0
Commit: 3e807b659b2fc3e0ebab3e261baca12a7fbfb29e
Parents: 39925d2 3425200
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Wed Jul 2 10:29:54 2014 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Wed Jul 2 10:29:54 2014 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
