ninja-correcting the the constant for LOCAL_ONE.
Merge branch 'cassandra-1.2' into cassandra-2.0
ninja-correcting the the constant for LOCAL_ONE in v2 of the native_protocol doc.
Merge branch 'cassandra-2.0' into trunk