Add CqlOutputFormat
patch by Paul Pak; reviewed by Piotr Kołaczkowski for CASSANDRA-6927
export MALLOC_ARENA_MAX corrrectly

Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6126
export MALLOC_ARENA_MAX corrrectly

Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6126
Merge branch 'cassandra-2.0' into cassandra-2.1
Add new CMS GC flags on Windows launch scripts for JVM > 7u60

Patch by Josh McKenzie, reviewed by jbellis for CASSANDRA-7714
backport CASSANDRA-6927 to 2.0
fix changes
fix generate-eclipse-files build.xml target on JDK 8

Patch by Robert Stupp, reviewed by Josh McKenzie for CASSANDRA-7430
Skip strict endpoint selection for ranges if RF == nodes

Patch by Sam Tunnicliffe; reviewed by tjake for CASSANDRA-7765
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Fix compactionstats layout for long ks/cf names

Patch by Nicolas Lalevée, reviewed by brandonwilliams for CASSANDRA-7263
merge
cqlsh should automatically disable tracing when selecting from system_traces

patch by Philip Thompson and Mikhail Stepura; reviewed by Mikhail Stepura for CASSANDRA-7641
Fix NPE at compaction leftover cleanup for dropped table

patch by yukim; reviewed by jbellis for CASSANDRA-7770
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Fixed the error when tracing query with cqlsh

patch by Robert Stupp; reviewed by Mikhail Stepura for CASSANDRA-7613
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	bin/cqlsh
Merge branch 'cassandra-2.0' into cassandra-2.1.0