Ninja-remove redundant text type from native proto spec (v2)
Streaming 2.0

patch by Yukim; reviewed by slebresne for CASSANDRA-5286
Never allow partition range queries in CQL3 without token()

patch by slebresne; reviewed by jbellis for CASSANDRA-5666
Add standalone sstableupgrade utility.
Patch by Nick Bailey, reviewed by brandonwilliams for CASSANDRA-5524
add license
merge from 1.2
r/m unreachable code
fix Upgrader for 2.0
ITC.close() resets peer msg version, causes connection thrashing in ec2 during upgrade.
Second pass, where we have Ec2MRS check that the perr node is on the same MS.current_version before
closing connection on publicIP and reconnecting on privateIP
changes.txt
StandaloneUpgrader fix
Merge branch 'cassandra-1.2' into trunk
Avoid over-reconnecting in EC2MRS
patch by jasobrown; reviewed by jbellis for CASSADNRA-5678
Merge branch 'cassandra-1.2' into trunk
cleanup
Merge branch 'cassandra-1.2' into trunk
use double math for currentThroughput
patch by dbrosius reviewed by jbellis for cassandra 5286
Return current values on failed CAS

patch by slebresne; reviewed by jbellis for CASSANDRA-5619
Conditional create/drop ks/table/index statements

patch by michalm; reviewed by slebresne for CASSANDRA-2737
Fix tracing when operation completesbefore all responses arrive
patch by jbellis; reviewed by slebresne for CASSANDRA-5668