remove unused import
remove dead code
Merge branch 'cassandra-2.1' into trunk
c* uses commons-lang3, use those deps, not lang
Merge branch 'cassandra-2.1' into trunk
Fix regression introduced by CASSANDRA-8115

Patch by Josh McKenzie, reviewed by Philip Thompson for CASSANDRA-8115
Merge branch 'cassandra-2.1' into trunk
fix typo in TriggerExecutor
patch by Liang Xie; reviewed by Vijay for CASSANDRA-8184
Merge branch 'cassandra-2.1' into trunk
Error when using hsha w/ unlimited rpc_max_threads

Patch by Tyler Hobbs; reviewed by Mike Adamson for CASSANDRA-8116
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Add 'die' policy for commit log and disk failure

patch by John Sumsion and Josh McKenzie, reviewed by blerer for CASSANDRA-7927
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/db/CommitLogTest.java
Fix test timeout in CQLSSTableWriterTest

Time out is caused by NPE when creating SSTable writer.
3.0 does not have ks and cf names in SSTable file name,
when writing SSTable, it has to be under ks/cf directory.
fixver for 7546
Merge branch 'cassandra-2.1' into trunk
Shutdown JVM on file descriptor exhaustion

patch by jmckenzie, reviewed by marcuse for CASSANDRA-7579
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cli/CliClient.java
	src/java/org/apache/cassandra/cli/CliMain.java
	src/java/org/apache/cassandra/cli/CliSessionState.java
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
	src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
fix error from merge