Add more data type mappings for pig.
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6128
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
Merge branch 'cassandra-2.0' into trunk
Trace index selection
patch by Lyuben Todorov and jbellis for CASSANDRA-6001
merge from 1.2
merge from 2.0
fix build
Merge branch 'cassandra-1.2' into cassandra-2.0
Revert metrics upgrade from stress.
Patch by Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-6153
Update sstablesPerReadHistogram to use biased sampling
patch by jbellis; reviewed by yukim for CASSANDRA-6164
add live/tombstoned histogram counts to cfstats
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-5889
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
add 6164 to NEWS
merge from 2.0
rewrite sendRR API to fix regressions from #6132
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6165