minor cleanups in trigger sample
Add --resolve-ip option to 'nodetool ring'

patch by Yasuharu Goto; revised by Mikhail Stepura for CASSANDRA-7210
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
fix typo
add the sample properties file to the example trigger jar so it can be loaded
Backported CASSANDRA-5818 to cassandra-2.0

patch by Lyuben Todorov; reviewed by Mikhail Stepura
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
minor nit: use the keyspace parameter
Limit user types to the keyspace they are defined in

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6643
Merge branch 'cassandra-2.1' into trunk
reduce garbage on codec flag deserialization

patch by belliottsmith reviewed by dbrosius for cassandra-7244
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Improve javadoc for KeysIndex

patch by plin reviewed by dbrosius for cassandra-7253
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
allow num_tokens to be unspecified, as described in the yaml
Merge branch 'cassandra-2.0' into cassandra-2.1