Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
remove servlet-api and license, unused since avro removal
additional check for offheap bloom filter size
patch by Vijay; reviewed by jbellis for CASSANDRA-5903
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Fix for missing filter type in 2.0 branch
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
reduce Map allocations in hinted handoff delivery
patch by dbrosius reviewed by jbellis for cassandra-5919
reduce Map allocations in hinted handoff delivery
patch by dbrosius reviewed by jbellis for cassandra-5919
Improve serialization in the native protocol

patch by slebresne; reviewed by danielnorberg for CASSANDRA-5664
Merge branch 'cassandra-2.0' into trunk
Fix changelog
Add SSTableSplitter tool to split sstables offline

patch by slebresne; reviewed by krummas for CASSANDRA-4766
Merge branch 'cassandra-1.2' into cassandra-2.0.0

Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk