Catch errors when the JVM pulls the rug out from GCInspector
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-5345
merge from 2.0
Ninja: add note about CQL2 removal to CQL2 docs
Merge branch 'cassandra-2.0' into cassandra-2.1.0

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

Conflicts:
	CHANGES.txt
Add ALLOW FILTERING and CONTAINS to cqlsh post-6910

Patch by Robert Stupp, reviewed by brandonwilliams for CASSANDRA-7588
Follow up on CASSANDRA-6596

Add null check for sstableloader
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Pig support for hadoop CqlInputFormat

Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6454
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Pig support for hadoop CqlInputFormat

Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6454
Ninja: fix index name spec for CREATE INDEX in CQL docs

Follow-up for CASSANDRA-7527
Merge branch 'cassandra-2.1.0' into cassandra-2.1
cqlsh: fix message when zero rows are returned

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7580
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	bin/cqlsh
merge
update changes
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	CHANGES.txt