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
2.0 targets 1.7 (see b3101a17); binary artifacts build w/ 1.7
update news
Save EC2Snitch topology information in system table - take 2
patch by Vijay; reviewed by Jason Brown for CASSANDRA-5171
Allow nodetool issued w/o commands or with help to run even if no server is active
patch by mmainali reviewed by dbrosius for cassandra 5734
Expire entries out of ThriftSessionManager (round two, for THsHaDisruptorServer on trunk)
patch by jasobrown; reviewed by jbellis for CASSANDRA-5719
Add timeout events to query traces
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5520
merge from 1.2
Add trigger examples
patch by Vijay; reviewed by jbellis for CASSANDRA-5574
Cleanup AbstractType/TypeSerializer classes

patch by slebresne; reviewed by carlyeks for CASSANDRA-5744
Optimized data structure for range tombstones

patch by slebresne; reviewed by frousseau for CASSANDRA-5677
Merge commit '6e81f816c730de1798fede6073b0908bf49ee5c0' into trunk
Optimized data structure for range tombstones (trunk version)
Fix querying with an empty (impossible) range

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5573
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Remove commented code
Merge branch 'cassandra-1.2' into trunk
remove dead assignment