Revert use of speculative retries by default for now
Fix SSTableLoader

patch by thobbs; reviewed by slebresne for CASSANDRA-6205
License and versions for 2.0.2 release
Fix harmless NPE in MM/HHOM
Patch by brandonwilliams, reviewed by Tyler Hobbs for CASSANDRA-5185
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	build.xml
Reject bootstrapping endpoints that are already in the ring with
different gossip data
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-5571
Merge branch 'cassandra-2.0' into trunk
update changes
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt
add ticket number to changes
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
fix a bunch of typos
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into trunk
add windows bat files for shell commands
patch by sdelmas reviewed by dbrosius for CASSANDRA-6145
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Use smaller stack size for tests