Merge branch 'cassandra-2.1' into trunk
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
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	CHANGES.txt
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
Merge branch 'cassandra-2.1' into trunk
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 branch 'cassandra-2.1' into trunk
merge
merge
update changes
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
remove errant code block
Merge branch 'cassandra-2.1' into trunk
Give read access to system.schema_usertypes to all authenticated users

patch by Mike Adamson; reviewed by Aleksey Yeschenko for CASSANDRA-7578

Conflicts:
	CHANGES.txt