cleanup
CHANGES
merge
Fix batchlog to account for CF truncation records

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6999
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/BatchlogManager.java
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/HintedHandOffManager.java
	src/java/org/apache/cassandra/db/RowMutation.java
	src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
	src/java/org/apache/cassandra/service/StorageProxy.java
	test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
	test/unit/org/apache/cassandra/db/HintedHandOffTest.java
trivial typos in changes.txt
cqlsh: Updated CQL3 parser to support functions and BLOB literals

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

Conflicts:
	CHANGES.txt
	bin/cqlsh
	pylib/cqlshlib/cql3handling.py
Fix changelog
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Queries on compact tables can return more results than requested

patch by slebresne; reviewed by thobbs for CASSANDRA-7052
Use timestamp from the statement instead of "now"

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7053
Nodetool rebuild_index requires named indexes argument

patch by Stunnicliffe reviewed by dbrosius for cassandra-7038
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix CQL version number for CASSANDRA-7055
Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Log a warning for large batches
patch by Lyuben Todorov; reviewed by Benedict Elliott Smith for CASSANDRA-6487
Fix schema concurrency exceptions (backport of #6841)
Merge branch 'cassandra-1.2' into cassandra-2.0
Don't NPE when username is supplied but password isn't.

Patch by Mike Adamson, reviewed by brandonwilliams for CASSANDRA-7050