no need for toLowerCase() and equalsIgnoreCase() at the same time
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Support negative timestamps in DateType.fromString

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6718
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Don't attempt cross-dc forwarding interface/mixed-version cluster with 1.1
patch by Jeremiah Jordan; reviewed by jbellis for CASSANDRA-6732
Merge branch 'cassandra-1.2' into cassandra-2.0
Use correct partitioner in AbstractViewSSTableFinder
patch by jbellis; reviewed by yukim for CASSANDRA-6734
merge from 2.0
Merge branch 'cassandra-2.1' into trunk
Allow nodetool to use a file/prompt for password
Patch by Clément Lardeur, reviewed by Sankalp Kohli for CASSANDRA-6660
Merge branch 'cassandra-2.1' into trunk
Avoid NPEs when receiving table changes for an unknown keyspace

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for CASSANDRA-5631
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/MigrationManager.java
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Catch memtable flush exceptions during shutdown
patch by Sergio Bossa; reviewed by jbellis for CASSANDRA-6735
merge from 1.2
Merge branch 'cassandra-2.0' into cassandra-2.1