Update versions for 1.2.17 release
Support DISTINCT for static columns

This also fix the behaviour when DISTINCT is not used.

patch by slebresne; reviewed by thobbs for CASSANDRA-7305
Refuse range queries with strict bounds on compact tables

patch by slebresne; reviewed by iamaleksey for CASSANDRA-7059
Versions update for 2.0.9 release
Support Thrift tables clustering columns on CqlPagingInputFormat

patch by pauloricardomg; reviewed by alexliu68 for CASSANDRA-7445
Merge commit 'c9cef44a1a6c10036200f410c8a26942e64c8f12' into cassandra-2.0
Expose global CF metrics

Patch by Chris Lohfink, reviewed by brandonwilliams for CASSANDRA-7273
Document initial_token/num_tokens behavior when both are set

Patch by Philip Thompson, reviewed by brandonwilliams for CASSANDRA-7411
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	build.xml
	debian/changelog
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix race in FileCacheService RemovalListener
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7278
Merge branch 'cassandra-2.0' into cassandra-2.1
Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM operations to incorrect become full QUORUM
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7345
merge from 2.0
Merge branch 'cassandra-2.1' into trunk
Improve schema merge performance

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7444
Merge branch 'cassandra-2.1' into trunk
Starting to work on overlapping compaction strategy
More OCS stuff