remove recursive infinite loop
fix for througput bits to bytes
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/streaming/StreamManager.java
minor cleanups in unit tests
Add equals and hashcode methods for SpeculativeRetry (CASSANDRA-6712)
Properly validate cellname max size in CQL3
CQL3: improve support for paginating over composites

patch by slebresne; reviewed by iamaleksey for CASSANDRA-4851
Fix count(*) queries in a mixed cluster

patch by Tyler Hobbs; reviewed by Piotr Kołaczkowski for CASSANDRA-6707
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/CFDefinition.java
	src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java
	src/java/org/apache/cassandra/cql3/Cql.g
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/db/marshal/CompositeType.java
Undo CASSANDRA-6707 from trunk
Versions and licenses in preparation for 2.1.0-beta1 release
Remove now unused depency on snaptree
Update NOTICE file
Fix snapshot repair not snapshotting coordinator

patch by yukim; reviewed by sankalp kohli for CASSANDRA-6713
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/AntiEntropyService.java
Merge branch 'cassandra-2.0' into cassandra-2.1
remove deb init cruft
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.1' into trunk