handleStateLeft no longer needs the version - removed
Swap THshaServer for TThreadedSelectorServer
Patch by tjake; reviewed by jbellis for CASSANDRA-5530
Disallow renaming columns one at a time when when the table don't have CQL3 metadata yet

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5531
cqlsh: add CLUSTERING ORDER BY support to DESCRIBE

patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-5528
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	bin/cqlsh
	src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
Ninja-fix test_cqlsh_output.py
Merge branch 'cassandra-1.2' into trunk
Removed token range bisection
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5518
Give users a clue how they called it.
Merge branch 'cassandra-1.1' into cassandra-1.2
Give users a clue how they called it.
Merge branch 'cassandra-1.2' into trunk
Give users a clue how they called it.
Give users a clue how they called it.
SchemaLoader.oldCfIdGenerator no longer used - removed
minor javadoc fixes
fix mvn-install target
patch by stunnicliffe reviewed by dbrosius for CASSANDRA-5532
IOException related cleanups
explicitly set java source and target to 1.6 for the ant tasks
patch by dbrosius reviewed by slebresne for CASSANDRA-5533
Merge branch 'cassandra-1.0' into cassandra-1.1