Merge branch 'cassandra-2.0' into cassandra-2.1
fix changes for b2
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1

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

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

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

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
	src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1

Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
Update java-driver to 2.0 final for stress

patch by djatnieks; reviewed by slebresne for CASSANDRA-6777
Merge branch 'cassandra-2.0' into cassandra-2.1
merge from 2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Add hadoop progressable compatibility.
Patch by Ben Coverston, reviewed by brandonwilliams for CASSANDRA-5201
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/db/SystemKeyspace.java
	src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
	src/java/org/apache/cassandra/utils/FBUtilities.java
	test/long/org/apache/cassandra/db/LongKeyspaceTest.java
	test/unit/org/apache/cassandra/SchemaLoader.java
	test/unit/org/apache/cassandra/config/DefsTest.java
	test/unit/org/apache/cassandra/db/CollationControllerTest.java
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
	test/unit/org/apache/cassandra/db/KeyspaceTest.java
	test/unit/org/apache/cassandra/db/ReadMessageTest.java
	test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
	test/unit/org/apache/cassandra/db/RemoveCellTest.java
	test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
	test/unit/org/apache/cassandra/tools/SSTableExportTest.java
Merge branch 'cassandra-2.0' into cassandra-2.1

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

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java