5306 test fix
Fix repair hanging silently on an unexpected error

patch by yukim; reviewed by slebresne for CASSANDRA-5229
Fix Ec2Snitch regression introduced by CASSANDRA-5171

patch by vijay2win; reviewed by driftx and arya for CASSANDRA-5432
Merge branch 'cassandra-1.2' into trunk
reduce unused empty map creation in the local writes (sendToHintedEndpoints) case
patch by dbrosius reviewed by jbellis for CASSANDRA-5538
add support for bind variables to non-prepared statements.

patch by marcuse, reviewed by pcmanus for CASSANDRA-5349
Add alias support to SELECT statement

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5075
don't declare throwing exceptions that aren't thrown
cqlsh: ninja-kill 'Perhaps you meant to use CQL X' warning
Merge branch 'cassandra-1.2' into trunk
Single-pass compaction
patch by jbellis; reviewed by marcuse for CASSANDRA-4180
tweak assert to match what it says it does
use waitOnFuture more often
presize collection
whitespace
r/m redundant log line on startup
MemoryMeter is no longer used by CacheService
Merge branch 'cassandra-1.2' into trunk