merge from 1.2
Merge branch 'cassandra-2.0' into trunk
Fix NPE in cas operations

patch by slebresne; reviewed by jbellis for CASSANDRA-5925
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Update versions for 2.0 final release
Fix CqlRecordWriter with composite keys
patch by Craig McMillian; reviewed by jbellis for CASSANDRA-5949
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Add snitch, schema version, cluster, partitioner to JMX
patch by Lyuben Todorov; reviewed by Jeremiah Jordan for CASSANDRA-5881
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
Fix streaming does not transfer wrapped range

patch by Sergio Bossa; reviewed by yukim for CASSANDRA-5948
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/streaming/StreamOut.java
	test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
Merge branch 'cassandra-2.0' into trunk
Improve leveled compaction's ability to find non-overlapping L0 compactions to work on concurrently
patch by marcuse and jbellis; reviewed by yukim for CASSANDRA-5921
merge from 2.0
Upgrade Thrift to 0.9.1

patch by Carl Yeksigian and Jake Farrell; reviewed by Aleksey Yeschenko
for CASSANDRA-5923
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
	tools/stress/src/org/apache/cassandra/stress/Session.java
	tools/stress/src/org/apache/cassandra/stress/StressStatistics.java
Fix licenses