unify test timeouts, exclude pig
Merge branch 'cassandra-1.2' into cassandra-2.0
exclude pig from test target
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix CounterContext.ContextState.copyTo() method
Let scrub optionally skip broken counter partitions

patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-5930
Unscarify 6510 CHANGES
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Fix direct Memory on architectures that do not support unaligned long access
patch by Dmitry Shohov and Benedict Elliott Smith for CASSANDRA-6628
fix NPE when stopping nonexistent native server, again.
Move handling of migration event source to solve bootstrap race.
Patch by Sergio Bossa and brandonwilliams, reviewed by Tyler Hobbs for
CASSANDRA-6648
Merge branch 'cassandra-1.2' into cassandra-2.0
Move handling of migration event source to solve bootstrap race.
Patch by Sergio Bossa and brandonwilliams, reviewed by Tyler Hobbs for
CASSANDRA-6648
Make sure compaction throughput values doesn't overflow because of int math
patch by pvai reviewed by dbrosius for cassandra-6647
Merge branch 'cassandra-1.2' into cassandra-2.0
get ocd on log capitalization
Update news, version in preparation for 1.2.15
Update changes and news file for 2.0.5 re-roll
Remove/update invalid sentences in CQL doc
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	NEWS.txt
	build.xml
	debian/changelog