Fix CQL3 doc typos
Merge branch 'cassandra-2.0' into trunk
Create snapshot directory if it does not exist.

patch by marcuse, reviewed by jbellis for CASSANDRA-6093
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/compaction/LegacyLeveledManifest.java
Throw an error when listen_address is 0.0.0.0
Patch by brandonwilliams, reviewed by dbrosius for CASSANDRA-5865
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Merge branch 'cassandra-2.0' into trunk
Fix fat client schema pull NPE

patch by Mikhail Panchenko; reviewed by Aleksey Yeschenko for
CASSANDRA-6089
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into trunk
Fix NPE in pig with tables created from thrift
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6072
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Change runtime exceptions to IOE in pig
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6099
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
don't let test pass by default
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
add back ScrubTest
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5730