Fix trigger directory detection code
Patch by Vijay, reviewed by jebllis for CASSANDRA-5826
Future-proof inter-major-version schema migrations

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5845
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/service/MigrationManager.java
make sure streams get closed
Better exception msg for invalid CLUSTRING ORDER
Merge branch 'cassandra-1.2' into trunk
updated versioning for 2.0.0 rc1 release
update test for separate paxos/commit CLs
fix CAS contention timeout
patch by Soumava Ghosh; reviewed by jbellis for CASSANDRA-5830
add CqlPagingRecordReader support for ReversedType in Thrift table
patch by Alex Liu; reviewed by jbellis for CASSANDRA-5718
Merge branch 'cassandra-1.2' into cassandra-2.0.0
update CHANGES
push down assignments to where they're needed
handle-trigger-non-existance
patch by Vijay; reviewed by Brandon Williams for CASSANDRA-5826
fix typo
handle-trigger-non-existance
patch by Vijay; reviewed by Brandon Williams for CASSANDRA-5826
fix typo
Merge branch 'cassandra-2.0.0' into trunk
Notify indexer of columns shadowed by range tombstones
patch by Sam Tunnicliffe; reviewed by jbellis for CASSANDRA-5614
Merge branch 'cassandra-2.0' into trunk