Update versions for 2.0.11
Fix validation with multiple CONTAINS clauses

patch by blerer; reviewed by slebresne for CASSANDRA-8131
Dont notify when replacing tmplink-files

Patch by marcuse; reviewed by yukim for CASSANDRA-8157
Merge branch 'cassandra-2.1' into trunk
Avoid boxing in ColumnStats min/max trackers

Patch by Rajanarayanan Thottuvaikkatumana; reviewed by Tyler Hobbs for
CASSANDRA-8109
Fix CREATE TABLE for CQL2

patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for
CASSANDRA-8144
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
Avoid boxing in ColumnStats min/max trackers

Patch by Rajanarayanan Thottuvaikkatumana; reviewed by Tyler Hobbs for
CASSANDRA-8109
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/io/sstable/ColumnStats.java
Fix installing as service on Windows

Patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-8115
Merge branch 'cassandra-2.1' into trunk
Ninja: fix foreground flag broken by 8115
Merge branch 'cassandra-2.1' into trunk
Fix NPE when preparing statements

patch by blere; reviewed by slebresne for CASSANDRA-8090
Extend Descriptor to include a format value and refactor reader/writer apis

patch by tjake; reviewed by Marcus Eriksson for CASSANDRA-7443
Pig: Remove errant LIMIT clause in CqlNativeStorage
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
Merge branch 'cassandra-2.1' into trunk
Pig: Remove errant LIMIT clause in CqlNativeStorage

Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-8166
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt