Ninja: fix grammar for tuple type in CQL docs

Follow up for CASSANDRA-7527
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Fix row size miscalculation in LazilyCompactedRow

when RangeTombstone is involved.
patch by yukim; reviewed by jbellis for CASSANDRA-7543
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
update column_index_size_in_kb description
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Handle queries on multiple secondary index types

Patch and review by Sam Tunnicliffe and Tyler Hobbs for CASSANDRA-7525
Merge branch 'cassandra-2.1.0' into cassandra-2.1
add support for arbitrary -D options to .ps1 script
patch by Joshua McKenzie; reviewed by Philip Thompson for CASSANDRA-7435
Fix cqlsh authentication with 2.1 python driver

Patch by Mike Adamson; reviewed by Tyler Hobbs for CASSANDRA-7564
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Backport CASSANDRA-7454 to 2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Ninja: fix CASSANDRA-7454 placement in CHANGES.txt
fix setlogginglevel help in nodetool
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
colorize PK + clustering differently
patch by Mihai Seteu; reviewed by Robert Stupp for CASSANDRA-6910