Pig: fix duplicate schema error
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6309
Pig: don't assume all DataBags are DefaultDataBags
Patch by Mike Spertus, reviewed by brandonwilliams for CASSANDRA-6420
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
rm dead code
SSTable metadata(Stats.db) format change

patch by yukim; reviewed by thobbs for CASSANDRA-6356
Fix assertion failure in filterColdSSTables
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-6483
merge from 2.0
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk

Conflicts:
	build.xml
	src/java/org/apache/cassandra/io/sstable/Descriptor.java
	src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java
	src/java/org/apache/cassandra/io/sstable/SSTableReader.java