fix node's broadcast address sanity check
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Move BatchlogEndpointSelector to BatchlogManager.EndpointFilter + minor refactorings
Merge branch 'cassandra-2.1' into trunk
make sure zone info gets completely read
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
make sure streams get closed
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Issue a warning after 3 empty lines in statement

patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7142
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	bin/cqlsh
Merge branch 'cassandra-2.1' into trunk
fix time conversion to milliseconds in SimpleCondition.await

patch by jzhang reviewed by dbrosius for cassandra-7149
Merge branch 'cassandra-1.2' into cassandra-2.0
remove changes line for 7149 as it was not pulled forward
Fixup for CASSANDRA-6831 on 2.1