Revert 5417 changes to hadoop
Patch by slebresne, reviewed by brandonwilliams for CASSANDRA-7241
remove duplicate changes entry
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Add authentication support to shuffle

patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-6484
CHANGES.txt whitespace
Merge branch 'cassandra-1.2' into cassandra-2.0

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

Conflicts:
	CHANGES.txt
Fix DataOutputTest on Windows

Patch by Ala' Alkhaldi; review by Joshua McKenzie for CASSANDRA-7265
Ninja: remove redundant check for null
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/Tuples.java
cqlsh: Handle collections embedded into UDTs correctly.

patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7267
Ninja: use equals() for Boolean comparison
Merge branch 'cassandra-2.0' into cassandra-2.1
Ninja: add missing string format placeholder
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Tuple types

patch by slebresne; reviewed by thobbs for CASSANDRA-7248
Fix bug with some IN queries missing results

patch by slebresne; reviewed by thobbs for CASSANDRA-7105
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Ninja fix for CASSANDRA-7245