revert 27ed655fd0552055bd1c26c62c098c16501bc32b
Merge branch 'cassandra-1.2' into trunk
cleanup
CHANGES
clean up string concatenation in logging
inline AbstractColumnContainer and IIterableColumns
cleanup
retainAll is no longer needed now that supercolumns are gone
inline Column.serializer()
rename dis -> in, dos -> out
nothing uses ThreadSafeSortedColumns now that SuperColumns are gone
Invalid streamId in cql binary protocol when using invalid CL

patch by slebresne; reviewed by pchalamet for CASSANDRA-5164
Merge branch 'cassandra-1.2' into trunk
Fix validation for IN where clauses with collection

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5376
Copy ResultSet on count query to avoid ConcurrentModificationException

patch by slebresne; reviewed by jbellis for CASSANDRA-5282
Merge branch 'cassandra-1.2' into trunk
Correctly typecheck in CQL3 even in presence of ReversedType

patch by slebresne; reviewed by jbellis for CASSANDRA-5386
Merge branch 'cassandra-1.2' into trunk
Deserialize to arrays instead of trees
patch by jbellis; reviewed by slebresne for CASSANDRA-5389
avoid NPE on no-op major compaction