add tmp flag to Descriptor hashcode
patch by Boris Yen; reviewed by jbellis for CASSANDRA-4021
add tmp flag to Descriptor hashcode
patch by Boris Yen; reviewed by jbellis for CASSANDRA-4021
Merge branch 'cassandra-1.2' into trunk
Don't announce migrations to pre-1.2 nodes

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5334
Merge branch 'cassandra-1.2' into trunk
Don't request migrations from 1.2+ nodes
Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
Return empty schema to pre-1.2 nodes' migration requests
Merge branch 'cassandra-1.2' into trunk
Update versions and license for 1.2.3
r/m unused code
Fix race when opening ColumnFamilyStore; patch by yukim reviewed by jbellis for CASSANDRA-5350
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
Merge branch 'cassandra-1.2' into trunk
synchronize getLevelSize
fix off-by-one
Fix mixing prepared statements between keyspaces

patch by David Sauer; reviewed by slebresne for CASSANDRA-5352
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	CHANGES.txt
Fix the consistencylevel during bootstrap fix

patch by slebresne; reviewed by jbellis for CASSANDRA-5354