get ocd on log capitalization
bundle jna 4.0
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-5872
Remove the assert from DataTracker.unsubscribe()
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Avoid rare duplicate read repair triggering

patch by Yang Wei; reviewed by Aleksey Yeschenko for CASSANDRA-6606
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/service/ReadCallback.java