Merge branch 'cassandra-2.0' into cassandra-2.1

Browse Source

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/CFMetaData.java

...

This commit is contained in:

Aleksey Yeschenko 2014-04-24 02:03:16 +03:00

parent 072b488cfc c3550fe40c

commit 6acbb33fa4

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