Fix default timestamp in QueryOptions

patch by beobal; reviewed by slebresne for CASSANDRA-8246
Don't compile Thrift sources in Eclipse, use classes for an ant build

patch by Mikhail Stepura; reviewed by tjake for CASSANDRA-8250
Attach existing sources to "Referenced libraries" in Eclipse

Patch by Mikhail Stepura; reviewed by tjake for CASSANDRA-8240
Merge branch 'cassandra-2.1' into trunk
Fix sstable read rate tracking for NamesQueryFilters

Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-8239
Merge branch 'cassandra-2.1' into trunk
Fix issues w/ CONTAINS (KEY) queries on 2ary indexes

Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8147
Consolidate Relation.Type and IndexExpression.Operator

Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8147
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	test/unit/org/apache/cassandra/db/CleanupTest.java
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
	test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
Fix deletion for indexes on primary key columns

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

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
	src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
Ninja: update unit tests for CASSANDRA-8206
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
	test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/index/SecondaryIndex.java
modify test after CASSANDRA-7463 change
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
Merge branch 'cassandra-2.1' into trunk
Add column update delta histogram

Patch by Sankalp Kohli, review by jmckenzie for CASSANDRA-7979
Merge remote-tracking branch 'origin/trunk' into 7813-udf-keyspace
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/AtomicSortedColumns.java
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/Memtable.java
	src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java