Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
fix hinting for dropped local writes
patch by jbellis and aleksey for CASSANDRA-4753
Merge branch 'cassandra-1.2' into trunk
make sure OrderPreservingPartitionerTest runs clean
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
simplify CompactionIterable.getReduced
patch by jbellis; reviewed by Carl Yeksigian for CASSANDRA-5077
Merge branch 'cassandra-1.2' into trunk
Don't expire columns sooner than they should with 2ndary indexes

patch by amorton; reviewed by slebresne for CASSANDRA-5079
Merge branch 'cassandra-1.1' into cassandra-1.2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
Disallow counters in collection

patch by slebresne; reviewed by jbellis for CASSANDRA-5082
Merge branch 'cassandra-1.2.0' into cassandra-1.2

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-1.2' into trunk
formatting
Minimize byte array allocation by AbstractData{Input,Output}
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-5090
merge from 1.2
Improve handling a changing target throttle rate mid-compaction
patch by J.B. Langston; reviewed by jbellis for CASSANDRA-5087