update Thrift server comment
Merge branch 'cassandra-2.0' into trunk
Properly error out on CREATE INDEX on counter tables

patch by slebresne; reviewed by jbellis for CASSANDRA-6160
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
Merge branch 'cassandra-2.0' into trunk
Handle JMX notification failure for repair

patch by yukim; reviewed by pcmanus for CASSANDRA-6097
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/tools/NodeProbe.java
Merge branch 'cassandra-2.0' into trunk
fix trace activity from #6133
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Fetch no more than 128 splits in parallel
patch by Patricio Echague; reviewed by jbellis for CASSANDRA-6169
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk