remove vestigal Table.indexLocks
Fix TimeoutException when there is a firewall issue.
patch by Vijay; reviewed by jbellis for CASSANDRA-3533
replace LBQ with CLQ in RangeSliceResponseResolver
Allow empty blob literals in CQL3

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5452
Merge branch 'cassandra-1.2' into trunk
Fork spec of the native protocol for v2
remove CompactSerializerTest; it doesn't tell us  anything useful
Fix streaming RangeTombstones at column index boundary; patch by slebresne reviewed by yukim for CASSANDRA-5418
initial CAS support
patch by jbellis and slebresne for CASSANDRA-5062
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/ColumnIndex.java
	src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
	test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
fix merge failure
remove PBSPredictor
patch by jbellis; reviewed by marcuse for CASSANDRA-5455
Avoid serializing keyspace redundantly in RowMutation
patch by jbellis; reviewed by vijay for CASSANDRA-5458
fix SerializationsTest
make CompositesIndex.IndexEntry static to reduce footprint
Remove synchronization in long-running PCRS
Patch by Oleg Kibirev, reviewed by brandonwilliams for CASSANDRA-5456
Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
CASSANDRA-5459: remove node from seeds when it completely leaves the cluster.
This version slightly refactors Gossiper by pulling th seeds list building code
out of start() and into a shared method that removeEndpoint() will call.
Also, reload the seeds list, then remove the dead node.
Remove node from seeds list when it permanently leaves the cluster
patch by jasobrown; freviewed by driftx for CASSANDRA-5459.