bump thrift-server version to 0.3.7 to properly shutdown invocation pool shutdown
patch by Pavel Yaskevich; tested by Philip Thompson for CASSANDRA-7594
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	build.xml
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
update thrift-server license file
simplify/avoid possible npes
make Allocator a static inner class
use parameterized logging
fix boxing confusion
remove dead code
Fixed handling of non-intersecting ranges in anticompaction

patch by Mikhail Stepura; reviewed by Yuki Morishita for CASSANDRA-7892
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
(cqlsh) Removed "ALTER TYPE <name> RENAME TO <name>" from tab-completion

patch by Mikhail Stepura; reviewed by <committer> for CASSANDRA-7895
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Update versions and NEWS file for 2.1.0 release
Improve stress workload realism

patch by benedict; reviewed by tjake for CASSANDRA-7519
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
	tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefinedMixed.java
	tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java