Add reloadtriggers command to nodetool

patch by Suresh; reviewed by Aleksey Yeschenko for CASSANDRA-4949
Merge branch 'cassandra-2.0' into trunk
Fix altering column types

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6185
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/ColumnDefinition.java
	src/java/org/apache/cassandra/db/marshal/CompositeType.java
Merge branch 'cassandra-2.0' into trunk
ninja NodeProbe compactionHistory() -> getCompactionHistory()
Merge branch 'cassandra-2.0' into trunk
cqlsh: ignore empty 'value alias' in DESCRIBE

patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-6139
Merge branch 'cassandra-2.0' into trunk
BM.forceBatchlogReplay() should be executed in batchlogTasks

follow-up to CASSANDRA-6079
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
cqlsh: fix CREATE/ALTER WITH completion

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6196
Merge branch 'cassandra-2.0' into trunk
remove calculation of unused  expected compacted filesize
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
use parameterized logging
Backport CASSANDRA-6196 to 1.2

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6196
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	bin/cqlsh