cqlsh tracing: ninja-remove quotes around session_id
Merge branch 'cassandra-1.2' into trunk
Improve handling of directory creation failures

patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5196
Merge branch 'cassandra-1.2' into trunk
fix CompactionsTest assertion error
Merge branch 'cassandra-1.2' into trunk
Expose 2I to the rest of nodetool
Patch by Jason Brown, reviewed by brandonwilliams for CASSANDRA-4464
Merge branch 'cassandra-1.2' into trunk
update WordCount for SuperColumn refactor
update WordCountCounters for SuperColumn refactor
Binary protocol: avoid sending notification for 0.0.0.0

patch by slebresne; reviewed by jbellis for CASSANDRA-5227
un-revert #4366
Merge branch 'cassandra-1.2' into trunk
CQL3 refactor to allow conversion function

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5226
Fix drop of sstables in certain circumstance

patch by slebresne; reviewed by jbellis for CASSANDRA-5232
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/Term.java
	src/java/org/apache/cassandra/cql3/UpdateParameters.java
	src/java/org/apache/cassandra/cql3/operations/ColumnOperation.java
	src/java/org/apache/cassandra/cql3/operations/ListOperation.java
	src/java/org/apache/cassandra/cql3/operations/MapOperation.java
	src/java/org/apache/cassandra/cql3/operations/Operation.java
	src/java/org/apache/cassandra/cql3/operations/PreparedOperation.java
	src/java/org/apache/cassandra/cql3/operations/SetOperation.java
	src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
	src/java/org/apache/cassandra/db/SystemTable.java
cqlsh: ninja-fix indentation in Shell constructor
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	bin/cqlsh
Merge branch 'cassandra-1.2' into trunk
Modernize 4366 unrevert