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
WIP - creating ICpuAffinity and impl classes, then about to plug into netty impl
via the executor pools for handling I/O
WIP - cpu affinity
WIP - first pass at switching to FJP instead of TPE for stages in StageManager.
API needs to be cleaned up, but the basic hack job is in place :).
remove thread dump
WIP - made EqualSpread use a real random offset
WIP - force setting EqualSpread (for now)
switching to use FJT, and adding thread affinity to OTC and ITC
fix complation problems after rebase. RTPE was switched backed to not deriving from netty's TPS thingy.
switched from hard-coded IAffinity impl to using AffinitySupport, which figures out
which IAffinity impl to use based on os