cassandra/doc
Sam Tunnicliffe 14a332470c Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
2015-06-01 18:12:50 +01:00
..
cql Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-07-22 12:04:34 -05:00
cql3 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-06-01 18:12:50 +01:00
native_protocol_v1.spec Merge branch 'cassandra-2.0' into cassandra-2.1 2015-05-12 16:23:32 -05:00
native_protocol_v2.spec Merge branch 'cassandra-2.0' into cassandra-2.1 2015-05-12 16:23:32 -05:00
native_protocol_v3.spec Merge branch 'cassandra-2.0' into cassandra-2.1 2015-05-12 16:23:32 -05:00