Ninja: fixed cqlsh test (after 7d7d529)
Merge branch 'cassandra-2.1' into trunk
Improve PasswordAuthenticator default super user setup

patch by Aleksey Yeschenko; reviewed by Jeremiah Jordan for
CASSANDRA-7788
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Validate empty cell names from counter updates

patch by Aleksey Yeschenko; reviewed by Jeremiah Jordan for
CASSANDRA-7798
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/Constants.java
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/Constants.java
	src/java/org/apache/cassandra/cql3/UpdateParameters.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Throw EOFException if we run out of chunks in compressed file

Patch by marcuse; reviewed by yukim for CASSANDRA-7664.
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Anticompact sstables as groups

Patch by Russell Spitzer; reviewed by marcuse for CASSANDRA-6851
Stop inheriting liveRatio and liveRatioComputedAt from previous memtables

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for CASSANDRA-7796
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/DataTracker.java
	src/java/org/apache/cassandra/db/Memtable.java