Fix another typo
Merge branch 'cassandra-2.1' into trunk
Fix handling of RejectedExecution in sync Thrift server
patch by Christian Rolf and jbellis for CASSANDRA-6788
merge from 2.0
Merge branch 'cassandra-2.1' into trunk
fix CRLF in bash scripts when building on Windows
patch by Peter; reviewed by Joshua McKenzie for CASSANDRA-6798
Merge branch 'cassandra-2.1' into trunk
Add extra SSL cipher suites.

Patch by brandonwilliams, reviewed by Ray Sinnema for CASSANDRA-6613
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Fix CASSANDRA-6714 leftover issue
Merge branch 'cassandra-2.1' into trunk
Update hadoop_cql3_word_count example
patch by Chandar Pechetty; reviewed by Alex Liu for CASSANDRA-6703
merge from 2.0
Merge branch 'cassandra-2.1' into trunk
Add paranoid disk failure option.

Patch by marcuse, reviewed by kohlisankalp and jbellis for CASSANDRA-6646
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/CassandraDaemon.java
Merge branch 'cassandra-2.1' into trunk
Improve nodetool cleanup/scrub/upgradesstables failure handling.

Patch by marcuse, reviewed by jbellis for CASSANDRA-6774