Fix license
Don't NPE when shutting down non-existent thrift server
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Don't require the sysctl file to exist when deleting it
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
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
Merge branch 'cassandra-2.0' into trunk
use junit assertions for unit tests over java asserts
add path to MmappedSegmentedFile assertions
Merge branch 'cassandra-1.2' into cassandra-2.0
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