Merge branch 'cassandra-2.0' into cassandra-2.1

Browse Source

Conflicts:
	CHANGES.txt
	bin/cqlsh

...

This commit is contained in:

Aleksey Yeschenko 2014-05-25 18:16:32 +03:00

parent 3aef07dbaa 6faf80c9d2

commit a277eabe17

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