merge from 1.1
Pig: fix widerow/secondary env toggles
Patch by brandonwilliams reviewed by Jeremy Hanna for CASSANDRA-4749
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Sort commitlog segments for replay by id instead of mtime
patch by Fabien Rousseau; reviewed by jbellis for CASSANDRA-4793
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Upgrade to pig 0.10
Patch by brandonwilliams, reviewed by xedin for CASSANDRA-4691
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
remove unused fields/locals
remove unused ctors, 4 really confusing ones are enough
remove unused ctors, oops missed first commit with one
cqlsh: fix copy to/from for cql3
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4674
cqlsh: use libedit when readline is not available, if possible
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-3597
cqlsh: use libedit when readline is not available, if possible
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-3597
Merge branch 'cassandra-1.1' into trunk
update startup log messages
Patch by Vijay, reviewed by brandonwilliams for CASSANDRA-4802
Fix potential NPE during CFS reload

patch by slebresne; reviewed by xedin for CASSANDRA-4786
Fix composite index missing results

patch by slebresne; reviewed by jbellis for CASSANDRA-4796
Fix test setup and repair/LCS edge case for CASSANDRA-4799
Merge branch 'cassandra-1.1' into trunk
Move consistency level to the protocol level

patch by slebresne; reviewed by jbellis for CASSANDRA-4734