give CAS a minimum TTL of 3h
Add custom secondary index support to CQL3

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5484
Update version for 1.2.5 release
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	NEWS.txt
	doc/cql3/CQL.textile
	src/java/org/apache/cassandra/cql3/Cql.g
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
fix repair test after CASSANDRA-5523
fsync leveled manifest to avoid it getting corrupt

Patch by marcuse, reviewed by jbellis and carlyeks for CASSANDRA-5535
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	build.xml
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
	test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java
fix bad merge
remove throws declarations on methods that don't throw those exceptions
integratyWriter[sic] doesn't need to be a field of SSTableWriter
make CHECK_PERIOD_IN_MS field, static
Ninja-fix system tests
Ninja-unify 1.1/1.2/2.0 system tests
Ninja-fix 1.2 system tests
Merge branch 'cassandra-1.2' into trunk
don't declare throwing exceptions that aren't thrown
don't declare throwing exceptions that aren't thrown
Update thrift-generated Constants.java
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	interface/thrift/gen-java/org/apache/cassandra/thrift/cassandraConstants.java