Expire entries out of ThriftSessionManager
patch by jasobrown; reviewed by jbellis for CASSANDRA-5719
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java
remove silly throws decl
Don't keep ancestor information in memory since it is only used on startup.

patch by marcuse, reviewed by jbellis for CASSANDRA-5342
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java
	src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
	test/unit/org/apache/cassandra/io/sstable/SSTableMetadataSerializerTest.java
Commit 3rd (and hopefully last) part of 5619
make starting native protocol server idempotent
patch by Manoj Mainali; reviewed by jbellis for CASSANDRA-5728
Merge branch 'cassandra-1.2' into trunk
Don't tie client side use of AbstractType to JDBC

patch by carlyeks; reviewed by ardot for CASSANDRA-4495
Add TimestampType to replace DateType

patch by slebresne; reviewed by jbellis for CASSANDRA-5723
Renames post 4495
use index interval from index summary
patch by yukim; reviewed by jbellis for CASSANDRA-5731
scripts fail when paths contain whitespace

Patch by Amichai Rothman; Reviewed by eevans for CASSANDRA-5338
cqlsh: fix handling of semicolons inside BATCH queries

patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5697
cqlsh: support the new TimestampType

patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5729
Merge branch '1.2' into trunk

Conflicts:
	bin/cassandra
	bin/cassandra-cli
	bin/json2sstable
	bin/nodetool
	bin/sstable2json
	bin/sstablekeys
	bin/sstableloader
Merge branch 'cassandra-1.2' into trunk
Version and licenses for 2.0.0-beta1 release
Expose native protocol server status in nodetool info

patch by mkmainali; reviewed by slebresne for CASSANDRA-5735
Merge branch 'cassandra-1.2' into trunk