fix format string token
Fix SP.sendToHintedEndpoints() javadoc
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Add more data type mappings for pig.
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6128
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
Add more data type mappings for pig.
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6128
Add more data type mappings for pig.
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6128
Fix FileCacheService regressions
patch by jbellis; reviewed by pyaskevich and tested by Kai Wang for CASSANDRA-6149
Merge branch 'cassandra-2.0' into trunk
Merge remote-tracking branch 'origin/trunk' into trunk
Save compaction history to system keyspace

patch by lantao yan; reviewed by yukim for CASSANDRA-5078
Merge branch 'cassandra-2.0' into trunk
fix merge from #6132
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6154
fix merge
Optimize auth setup

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6122
Merge branch 'cassandra-1.2' into cassandra-2.0
because git is full of shit
Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
Merge branch 'cassandra-2.0' into trunk
FD exposes a count of up/down machines over JMX
Patch by Sankalp Kohli, reviewed by brandonwilliams for CASSANDRA-6044
Merge branch 'cassandra-1.2' into cassandra-2.0