Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Fix CQL3 token() function when used with strings

patch by tjake; reviewed by slebresne for CASSANDRA-5050
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
Update version for 1.2.0-rc1 release
add warning to multithreaded_compaction
Merge branch 'cassandra-1.1' into cassandra-1.2.0
r/m unused field
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
add isRowCacheEnabled check to getRawCachedRow; checking cache capacity in getCRI is no longer necessary since it is done by isRowCacheEnabled
Merge branch 'cassandra-1.2' into trunk
Optimize name-based queries to use ArrayBackedSortedColumns
patch by Pavel Yaskevich; reviewed by slebresne and jbellis for CASSANDRA-5043
Merge branch 'cassandra-1.2' into trunk
cqlsh: add DESCRIBE KEYSPACES command;
patch by Aleksey Yeschenko, reviewed by Brandon Williams for
CASSANDRA-5060
Merge branch 'cassandra-1.2.0' into cassandra-1.2

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-1.2' into trunk
Add gc_grace_seconds to system_auth.users