Make sure both type name are prepared for a type rename
encapsulate SecondaryIndex.estimateResultRows
patch by Miguel Angel Fernandez Diaz; reviewed by Sam Tunnicliffe for CASSANDRA-6498
fix build
use junit assertions
Refuse snapshots during bootstrap.
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-6585
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-2.0' into trunk
Make TOKENS the canonical place to determine tokens.
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-5131
Add missing keyspace preparation to DropType too
Revert "move setting lastCompactedKey to before the return-if-nothing-added"

This reverts commit f3dc188e203b3db980ee81df05390968043cb601.
Avoid special casing received/expected counts in CAS timeout exceptions

patch by slebresne; reviewed by jbellis for CASSANDRA-6595
Merge branch 'cassandra-2.0' into trunk
Add support for 2.1 global counter shards

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6505
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/CounterCell.java
	src/java/org/apache/cassandra/db/CounterUpdateCell.java
	src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
	src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
	src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
	src/java/org/apache/cassandra/db/context/CounterContext.java
	src/java/org/apache/cassandra/io/sstable/AbstractSSTableSimpleWriter.java
	src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
	test/unit/org/apache/cassandra/db/CounterColumnTest.java
	test/unit/org/apache/cassandra/db/CounterMutationTest.java
	test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
getValidColumnFamilies adds 2I if requested and no ks/cf specified
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6598
getValidColumnFamilies adds 2I if requested and no ks/cf specified
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6598
Merge branch 'cassandra-2.0' into trunk
Add ks.cf names to tombstone logging
patch by Kevin Lovato; reviewed by jbellis for CASSANDRA-6597
Merge branch 'cassandra-2.0' into trunk
Update NEWS for 6589