fix file logger layout to not dump stacktrace over lines
Update versions, licenses for 1.2.12 release
close corrupt summary stream before trying to delete it
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-6380
Merge branch 'cassandra-2.0' into trunk
update pig example scripts
Patch by Jeremy Hanna, reviewed by brandonwilliams for CASSANDRA-6239
Fix FD leak on slice read path
patch by Graham Sanderson and jbellis; reviewed by slebresne and tested by mshuler for CASSANDRA-6275
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	build.xml
	debian/changelog
Merge branch 'cassandra-2.0' into trunk
Optimize FD phi calculation
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6386
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
Improve initial FD phi estimate when starting up
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6385
remove unused cruft from test
merge from 1.2
convert sum to double before dividing
Merge branch 'cassandra-2.0' into trunk
Merge remote-tracking branch 'origin/trunk' into trunk
make inner class static
Merge branch 'cassandra-2.0' into trunk