Fix int/bigint in CassandraStorage
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6102
Merge branch 'cassandra-1.2' into cassandra-2.0
Revert "Merge branch 'cassandra-1.2' into cassandra-2.0"

This reverts commit a3ad2e82249b88d4a05f24140948cdbc809d14f3, reversing
changes made to 8a506e66a66c004a7a253e3dd28845517da8a967.
Fix int/bigint in CassandraStorage
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6102
stress: add username/password authentication support

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6068
Merge branch 'cassandra-1.2' into cassandra-2.0
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