Merge ColumnFamily, ISortedColumns.  Add EmptyColumns and UnsortedColumns; clean up TMBSC, ABSC, and ASC
patch by jbellis; reviewed by Carl Yeksigian for CASSANDRA-5403
use guava's Iterators class and emptyIterator
with HashCodeBuilder use toHashCode() not hashCode()
fix duplicate ip address error message
IndexHelper.skipBloomFilters won't skip non-SHA filters, part 2
patch by Carl Yeksigian; reviewed by jasobrown got CASSANDRA-5385
comments and simplify comparator
OCD-ninja CFMetaData.BatchlogCF -> CFMetaData.BatchlogCf fix
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/BatchlogManager.java
OCD-ninja CFMetaData.CompactionLogCF -> CFMetaData.CompactionLogCf fix
fix regression when requested range does not overlap an sstable at all
patch by marcuse; reviewed by jbellis for CASSANDRA-5407
semi-ninja trivial IOE cleanup

patch by Aleksey Yeschenko; reviewed by Brandon Williams
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	src/java/org/apache/cassandra/db/RetriedSliceFromReadCommand.java
	src/java/org/apache/cassandra/service/ReadCallback.java
	src/java/org/apache/cassandra/service/RowDataResolver.java
IndexHelper.skipBloomFilters won't skip non-SHA filters (backport of patch2 to cassandra-1.2)
path by Carl Yekisian; reviewed by jasobrown for CASSANDRA-5385
fix seeking at the wrong place
Support indexes on composite column components

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5125
Add support for nulls in CQL3

patch by michalm & slebresne; reviewed by iamaleksey for CASSANDRA-3783
Merge branch 'cassandra-1.2' into trunk
update CHANGES
merge from 1.2
Remove unreachable (and unecessary) code