r/m Test.iml
Merge branch 'cassandra-2.0' into trunk
remove dead code
Improve batchlog write performance with vnodes

patch by Jonathan Ellis and Rick Branson; reviewed by Aleksey Yeschenko
for CASSANDRA-6488
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into trunk
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk