merge from 0.8

CHANGES.txt

@@ -21,10 +21,11 @@
  * Validate blank keys in CQL to avoid assertion errors (CASSANDRA-3612)
  * cqlsh: fix bad decoding of some column names (CASSANDRA-4003)
  * cqlsh: fix incorrect padding with unicode chars (CASSANDRA-4033)
- * Fix ConcurrentModificationException in gossiper (CASSANDRA-4019)
  * Fix EC2 snitch incorrectly reporting region (CASSANDRA-4026)
  * Shut down thrift during decommission (CASSANDRA-4086)
  * Expose nodetool cfhistograms for 2ndary indexes (CASSANDRA-4063)
+Merged from 0.8:
+ * Fix ConcurrentModificationException in gossiper (CASSANDRA-4019)
 
 
 1.0.8

conf/cassandra-env.sh

@@ -186,7 +186,7 @@ JVM_OPTS="$JVM_OPTS -Djava.net.preferIPv4Stack=true"
 # JVM_OPTS="$JVM_OPTS -Djava.rmi.server.hostname=<public name>"
 # 
 # see 
-# http://blogs.sun.com/jmxetc/entry/troubleshooting_connection_problems_in_jconsole
+# https://blogs.oracle.com/jmxetc/entry/troubleshooting_connection_problems_in_jconsole
 # for more on configuring JMX through firewalls, etc. (Short version:
 # get it working with no firewall first.)
 JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT" 

src/resources/org/apache/cassandra/cli/CliHelp.yaml

@@ -705,7 +705,7 @@ commands:
           It is also valid to specify the fully-qualified class name to a class that
           extends org.apache.Cassandra.db.marshal.AbstractType.
 
-        - key_valiation_class: Validator to use for keys.
+        - key_validation_class: Validator to use for keys.
           Default is BytesType which applies no validation.
 
           Supported values are: