typo
Merge branch 'cassandra-1.2' into cassandra-2.0
cleanup paxos tracing
fix re-propose of earlier, incomplete paxos round to use new ballot
patch by jbellis; reviewed by slebresne for CASSANDRA-5985
don't declare throwing exceptions that aren't thrown
Correctly handle limits in CompositesSearcher

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5975
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
Fix merge (s/>/>= in CompositesSearcher)
Pig support for CQL collections.
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-5867
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
Pass the updated cf to the PRSI index() method

patch by Ben Coverston; reviewed by Aleksey Yeschenko for
CASSANDRA-5999
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
Allow empty CQL3 batches as no-op

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5994
Support null in CQL3 functions

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5910
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/functions/TimeuuidFcts.java
preserve jvm_opts w/jemalloc
Support thrift tables in Pig CqlStorage
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-5847
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
Fix possible divide-by-zero in HHOM
patch by jbellis for CASSANDRA-5990
merge from 1.2