Merge branch 'cassandra-2.0' into cassandra-2.1.0

Browse Source

Conflicts:
	CHANGES.txt
	pylib/cqlshlib/test/test_cqlsh_output.py
	pylib/cqlshlib/test/test_keyspace_init.cql

...

This commit is contained in:

Tyler Hobbs 2014-08-12 15:14:14 -05:00

parent 59a8e1c6b6 0edd5ee981

commit 2db047b09f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available