Merge remote-tracking branch 'origin/trunk' into 7562-udf-java
Merge branch '7562-udf-java' into 7526
Merge remote-tracking branch 'origin/trunk' into 7562-udf-java
Merge branch '7562-udf-java' into 7526
Merge remote-tracking branch 'origin/trunk' into 7562-udf-java
Merge branch '7562-udf-java' into 7526
nit: whitespaces
Merge branch '7562-udf-java' into 7526
(Hadoop) allow ACFRW to limit nodes to local DC

patch by Robbie Strickland; reviewed by Aleksey Yeschenko for
CASSANDRA-7252
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/client/RingCache.java
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Properly reject operations on list index

patch by slebresne; reviewed by thobbs for CASSANDRA-7499
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Support list index operation with conditions

patch by slebresne; reviewed by thobbs for CASSANDRA-7499
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	CHANGES.txt
Fix dropping collection column when it's the last regular column

patch by slebresne; reviewed by iamaleksey for CASSANDRA-7744
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/CFMetaData.java
	src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java