Change merged row counts from int to long
Merge branch 'cassandra-1.2' into trunk
only fetch comparator if needed
clarity on max hint window
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	conf/cassandra.yaml
Merge branch 'cassandra-1.2' into trunk
Unbounded (?) thread growth connecting to an removed node
Patch by Vijay, reviewed by Brandon Williams for CASSANDRA-5175
Unbounded (?) thread growth connecting to an removed node
Patch by Vijay, reviewed by Brandon Williams for CASSANDRA-5175
Merge branch 'cassandra-1.2' into trunk
Fix test failures for CASSANDRA-5175
Fix test failures for CASSANDRA-5175
Merge branch 'cassandra-1.2' into trunk
Fix test failures for CASSANDRA-5175
Merge branch 'cassandra-1.2' into trunk
fix sstable maxtimestamp forrow deletes andpre-1.1.1 sstables
patch by jbellis; reviewed by slebresne for CASSANDRA-5153
merge from 1.1
Merge branch 'cassandra-1.2' into trunk
Validate compaction strategy options

patch by dbrosius; reviewed by slebresne for CASSANDRA-4795
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql/CFPropDefs.java
	src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
Fix small bug in handling SemanticVersion