Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
This commit is contained in:
Sylvain Lebresne 2014-07-02 10:29:54 +02:00
commit 3e807b659b

Diff Content Not Available