remove some deprecations in use of SnakeYaml
patch by dbrosius reviewed by jbellis for cassandra-5606
Backport from 2.0 - Expose whether jna is enabled and memory is locked via JMX
patch by dbrosius reviewed by jbellis for cassandra-5508
Merge branch 'cassandra-1.2' into trunk
don't declare throwing exceptions that aren't thrown
clean up shaky LeveledCompactionStrategyTest
cqlsh: fix COPY FROM with ReversedType

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

Conflicts:
	bin/cqlsh
Set -Djava.awt.headless=true for ant test

Makes running tests less annoying with OS X/Java7
Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
the commons-lang dependency is 2.6
Remove unused QueryProcessor methods
Merge branch 'cassandra-1.2' into trunk
Allow creating CUSTOM indexes on collections

patch by Ben Coverston; reviewed by Aleksey Yeschenko for
CASSANDRA-5615
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
Evaluate now() function at execution time

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5616
Merge branch 'cassandra-1.2' into trunk
More detailed read repair metrics.
Patch by Jingsi Zhu, reviewed by brandonwilliams for CASSANDRA-5618
More detailed read repair metrics.
Patch by Jingsi Zhu, reviewed by brandonwilliams for CASSANDRA-5618
More detailed read repair metrics.
Patch by Jingsi Zhu, reviewed by brandonwilliams for CASSANDRA-5618