Add errors setting to stress help, ninja
Merge branch 'cassandra-2.1' into trunk
Throw correct exception when trying to bind a keyspace or table name

patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for
CASSANDRA-6952
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Fix Accumulator.isEmpty method

patch by slebresne; reviewed by benedict for CASSANDRA-7873
Refuse Paxos operations with more than one pending endpoints

patch by slebresne; reviewed by kohlisankalp for CASSANDRA-8346
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Remove tmplink files for offline compactions

Patch by marcuse; reviewed by jmckenzie for CASSANDRA-8321
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
Default DTCS base_time_seconds changed to 60
patch by Björn Hegerfors; reviewed by jbellis for CASSANDRA-8417
merge from 2.0
Merge branch 'cassandra-2.1' into trunk
Fix error message on read repair timeouts

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-7947
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Support for user-defined aggregate functions

Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-8053
Make read "defrag" async to reclaim memtables

patch by benedict; reviewed by jbellis CASSANDRA-8459
Merge branch 'cassandra-2.1' into trunk