Remove buggy thrift max message length option
patch by jbellis; reviewed by tjake for CASSANDRA-5529
spilleng
Updates news file, version and missing licenses for 1.1.12 release
Fix 5488 round 2
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	CHANGES.txt
	NEWS.txt
	build.xml
	conf/cassandra.yaml
	debian/changelog
	src/java/org/apache/cassandra/config/Config.java
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
	src/java/org/apache/cassandra/thrift/CassandraDaemon.java
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java