NEWS
make it clear we are logging two stats for MS
Avoid using row cache on 2i CFs
patch by Sam Tunnicliffe and jbellis for CASSANDRA-5732
merge from 1.2
typos
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.0
typos
Fix compaction race during columnfamily drop
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5957
merge from 1.2
Fix validation of empty column names for compact tables

patch by slebresne; reviewed by jbellis for CASSANDRA-6152
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/UpdateParameters.java
Set MALLOC_ARENA_MAX when unset.
Patch by brandonwilliams for CASSANDRA-6126
fix missing then
Update the pig examples to include more recent pig/cassandra features.
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-4549
Merge branch 'cassandra-1.2' into cassandra-2.0
Add PigUnit unit tests.
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-5695
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	build.xml
	src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
Skip replaying mutations that pass CRC but fail to deserialize
patch by jbellis; reviewed by Lyuben Todorov for CASSANDRA-6183
merge from 1.2