cqlsh: fix LIST USERS output

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6242
Merge branch 'cassandra-2.0' into trunk
Add IRequestSink interface

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6248
Update memtable size while flushing

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6249
Merge branch 'cassandra-2.0' into trunk
use junit assertions for unit tests over java asserts
close streams
Provide hooks around CQL2/CQL3 statement execution

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6252
Merge branch 'cassandra-2.0' into trunk
Require Permission.SELECT for CAS updates

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6247
Merge branch 'cassandra-2.0' into trunk
Require logging in for Thrift CQL2/3 statement preparation

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6254
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/thrift/CassandraServer.java
Merge branch 'cassandra-2.0' into trunk
Allow overriding max hin ttl.
Patch by Vishy Kasar, reviewed by brandonwilliams for CASSANDRA-5988
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Allow overriding max hint ttl
Patch by Vishy Kasar and brandonwilliams, reviewed by brandonwilliams
for CASSANDRA-5988
Merge branch 'cassandra-2.0' into trunk
Ninja: use v1 (time) instead of v4 (random) UUID for the batchlog