Merge branch 'cassandra-2.0' into trunk
Handle null correctly in CqlStorage
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6180
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
Merge branch 'cassandra-2.0' into trunk
Fix updating column_metadata from thrift

patch by slebresne; reviewed by jbellis for CASSANDRA-6182
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt
Only pass UseCondCardMark to 64bit JVMs
Patch by brandonwilliams, reviewed by eevans for CASSANDRA-6190
Merge branch 'cassandra-2.0' into trunk
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