restrict max_num_tokens to 1536
patch by jbellis; reviewed by brandonwilliams and Quentin Conner for CASSANDRA-6267
Use non-pooled SegmentedFile builders when bulk loading
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6272
Nodetool gets default JMX port from cassandra-env.sh
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6273
add non-jamm path for cached statements
patch by Michael Stepura; reviewed by jbellis for CASSANDRA-6293
make calculatePendingRanges asynchronous
Add missing files
Remove blocking flushes in gossip thread
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6297
show the host and port when failing to connect
Make CPRR more robust to failures.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6302
Fix potential socket leak in connectionpool creation
patch by Minh Do; reviewed by jbellis for CASSANDRA-6308
Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleStrategy
patch by Alex Liu; reviewed by jasobrown for CASSANDRA-6238
Fix counter header length shortcut logic
cqlsh: handle 'null' as session duration

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6317
typo
Add echo off to cqlsh.bat
Patch by Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-6324
Fix json2sstable handling of range tombstones

patch by Lyuben Todorov; reviewed by Aleksey Yeschenko for
CASSANDRA-6316
Fixing missing one row during reverse query on compact tables

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6330
Fix reading expired row value from row cache
patch by jbellis; reviewed by Mikhail Stepura for CASSANDRA-6325