Merge branch 'cassandra-1.2' into trunk

CHANGES.txt

@@ -47,6 +47,7 @@
 
 
 1.2.5
+ * make BytesToken.toString only return hex bytes (CASSANDRA-5566)
  * Ensure that submitBackground enqueues at least one task (CASSANDRA-5554)
  * fix 2i updates with identical values and timestamps (CASSANDRA-5540)
  * fix compaction throttling bursty-ness (CASSANDRA-4316)

src/java/org/apache/cassandra/dht/BytesToken.java

@@ -41,7 +41,7 @@ public class BytesToken extends Token<byte[]>
     @Override
     public String toString()
     {
-        return "Token(bytes[" + Hex.bytesToHex(token) + "])";
+        return Hex.bytesToHex(token);
     }
 
     public int compareTo(Token<byte[]> o)