Fix license
Don't NPE when shutting down non-existent thrift server
Merge branch 'cassandra-1.2' into cassandra-2.0
Don't require the sysctl file to exist when deleting it
Merge branch 'cassandra-1.2' into cassandra-2.0
assume python is on path for windows for cqlsh.bat
patch by mstepura reviewed by dbrosius for cassandra-6145
Merge branch 'cassandra-1.2' into cassandra-2.0
add path to MmappedSegmentedFile assertions
Merge branch 'cassandra-1.2' into cassandra-2.0
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
Fix updating column_metadata from thrift

patch by slebresne; reviewed by jbellis for CASSANDRA-6182
Only pass UseCondCardMark to 64bit JVMs
Patch by brandonwilliams, reviewed by eevans for CASSANDRA-6190
cqlsh: fix LIST USERS output

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6242
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
Provide hooks around CQL2/CQL3 statement execution

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6252
Require Permission.SELECT for CAS updates

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6247
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