suppress output of index_options when empty
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
ninja relocate crc_check_chance removal from options list
ninja relocate crc_check_chance removal from options list
Fix for IndexHelper.IndexFor OOB Exception

Patch by tjake; reviewed by jbellis for CASSANDRA-5030
Pull schema immediately when bootstrapping.
Patch by Chris Herron and brandonwilliams, reviewed by jbellis for
CASSANDRA-5025
Merge branch 'cassandra-1.1' into cassandra-1.2.0

Conflicts:
	src/java/org/apache/cassandra/service/MigrationManager.java
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
Pull schema immediately when bootstrapping.
Patch by Chris Herron and brandonwilliams, reviewed by jbellis for
CASSANDRA-5025
add #2474, #4434 to CHANGES
edit changes
merge from 1.1
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
Cleanup from 5025, allow recovering nodes to pull immediately
Merge branch 'cassandra-1.1' into cassandra-1.2.0

Conflicts:
	src/java/org/apache/cassandra/service/MigrationManager.java
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-1.2.0' into cassandra-1.2