CHANGES
Merge branch 'cassandra-2.0' into cassandra-2.1
Better validation of collection values

patch by slebresne; reviewed by thobbs for CASSANDRA-7833
Track min/max timestamps and maxLocalDeletionTime correctly

Patch by marcuse; reviewed by tjake for CASSANDRA-7969
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/serializers/ListSerializer.java
Merge branch 'cassandra-2.1' into trunk
Make native server start block until properly bound

patch by slebresne; reviewed by xedin for CASSANDRA-7885
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/ColumnFamily.java
	src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
	src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
Notify whenever we replace an SSTableReader

Patch by marcuse; reviewed by yukim for CASSANDRA-8034
Merge branch 'cassandra-2.1' into trunk
Fix potential exception with ReversedType in DynamicCompositeType

patch by timw; reviewed by slebresne for CASSANDRA-7898
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Release references to compacted overlapping sstables during compaction

Patch by benedict; reviewed by marcuse for CASSANDRA-7819
Add protocol v4 spec document
Merge branch 'cassandra-2.1' into trunk
fix build
Merge branch 'cassandra-2.1' into trunk