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
fix nodetool clearsnapshot console message
patch by dbrosius reviewed by jbellis for cassandra-5478
Merge branch 'cassandra-1.2' into trunk
clean up merge
Merge branch 'cassandra-1.2' into trunk
Reuse prepared statements in hot auth queries

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5594
Merge branch 'cassandra-1.2' into trunk
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
Binary protocol: adds message to batch (prepared or not) statements

patch by slebresne; reviewed by iamaleksey for CASSANDRA-4693
Fix changelog
Fix InputKeyRange in CFIF
patch by Lanny Ripple and jbellis; reviewed by Alex Liu for CASSANDRA-5536
Merge branch 'cassandra-1.2' into trunk
Add support for specifying CAS commit ConsistencyLevel
patch by jbellis; reviewed by aleksey for CASSANDRA-5442
Allow preparing timestamp, ttl and limit in queries

patch by slebresne; reviewed by iamaleksey for CASSANDRA-4450
Add tracing to min/max column name sstable elimination (see CASSANDRA-5514).

Patch by marcuse, reviewed by jbellis for CASSANDRA-5595
Add get commands for compaction/streaming throughput to nodetool.
Patch by Michal Michalski, reviewed by brandonwilliams for
CASSANDRA-5588