Fix race in Thrift server that can exhaust the pool of worker threads
patch by Christian Rolf and jbellis for CASSANDRA-6788
Merge branch 'cassandra-1.2' into cassandra-2.0
Ninja-fix counter-in-primary-key validation exception message
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
Merge branch 'cassandra-2.0' into cassandra-2.1
Support auth in CqlRecordWriter

Patch by Alex Liu, reviewed by Ben Coverston for CASSANDRA-7340
Merge branch 'cassandra-2.0' into cassandra-2.1
Check all INTERNAL_IP states for seed match.

Patch by Brandon Williams, reviewed by Jason Brown for CASSANDRA-6523
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/gms/Gossiper.java
Merge branch 'cassandra-2.0' into cassandra-2.1
Fix native protocol CAS batches

patch by Sylvain Lebresne; reviewed by Aleksey Yeschenko for
CASSANDRA-7337
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/transport/messages/BatchMessage.java
add logs/ and data/ to .gitignore
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
simplify: prefer containsKey(x) to keySet().contains(x)
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Explicitly use Long.MAX_VALUE timestamp for counter deletions

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7346
Use node's host id in place of counter ids

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7366