Merge branch '2.10.x'

* 2.10.x: (36 commits)
  Normalized line endings.
  New .gitattributes file.
  Disabled failing build manager tests.
  New test case for SI-6337
  New test case for closing SI-6385
  Value classes: eliminated half-boxing
  Cleanup of OverridingPairs
  Fixes SI-6260
  Use faster download URL now that artifactory is fixed.
  don't try to create tags w/o scala-reflect.jar
  some small remaining fixes
  SI-5943 toolboxes now autoimport Predef and scala
  Fix for loud test.
  SI-6363 deploys the updated starr
  SI-6363 removes scala.reflect.base
  SI-6392 wraps non-terms before typecheck/eval
  SI-6394 fixes macros.Context.enclosingClass
  Error message improvement for SI-6336.
  Adjustments to scala.concurrent.duration.
  prepping for the refactoring
  ...

Conflicts:
	src/actors-migration/scala/actors/Pattern.scala
	src/compiler/scala/tools/nsc/Global.scala
	src/compiler/scala/tools/nsc/transform/Erasure.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/library/scala/collection/immutable/Vector.scala
	test/files/jvm/actmig-PinS_1.scala
	test/files/jvm/actmig-PinS_2.scala
	test/files/jvm/actmig-PinS_3.scala
	test/files/jvm/actmig-public-methods_1.scala

1 files changed, 42 insertions, 42 deletions

diff --git a/test/files/bench/equality/eqeq.eqlog b/test/files/bench/equality/eqeq.eqlog
index d1e27aceed..55a5eb430a 100644
--- a/test/files/bench/equality/eqeq.eqlog
+++ b/test/files/bench/equality/eqeq.eqlog
@@ -1,42 +1,42 @@
-Banchmark results for testing equality operations:

-eq.scala: Base case, use eq equality only

-eqeq.scala: Test case, use == instead of eq.

-All tests run on Thinkpad T400, 1.6.0_12 client VM.

-Test command: java eq 5 5

-              java eqeq 5 5

-eq.scala, no -optimise

-eq$		109		78		79		63		63

-eq$		94		63		63		78		78

-eq$		94		62		62		62		78

-eq$		94		78		78		78		78

-eq$		94		78		78		78		78

-eq.scala, with -optimise

-eq$		421		63		62		47		63

-eq$		406		62		62		63		62

-eq$		407		62		62		78		63

-eq$		406		63		63		62		62

-eq$		407		62		62		63		47

-eqeq.scala with version of BoxesRuntime as of Nov 13th, no -optimise

-eqeq$		562		516		516		516		515

-eqeq$		547		515		515		531		532

-eqeq$		532		516		516		515		516

-eqeq$		547		531		531		516		531

-eqeq$		547		515		515		516		516

-eqeq.scala with version of BoxesRuntime as of Nov 13th, with -optimise

-eqeq$		1031		390		391		391		391

-eqeq$		1031		391		391		391		390

-eqeq$		1031		390		390		391		391

-eqeq$		1031		406		407		391		390

-eqeq$		1031		390		390		391		391

-eqeq.scala with 1st optimized of Nov 14th, no -optimise

-eqeq$		484		421		438		438		437

-eqeq$		484		438		437		437		438

-eqeq$		469		437		453		454		438

-eqeq$		468		437		438		468		438

-eqeq$		485		437		437		422		438

-eqeq.scala with 1st optimized of Nov 14th, with -optimise

-eqeq$		1016		375		391		375		375

-eqeq$		1016		375		391		390		375

-eqeq$		1016		390		391		375		375

-eqeq$		1015		375		391		390		375

-eqeq$		1016		390		375		375		375

+Banchmark results for testing equality operations:
+eq.scala: Base case, use eq equality only
+eqeq.scala: Test case, use == instead of eq.
+All tests run on Thinkpad T400, 1.6.0_12 client VM.
+Test command: java eq 5 5
+              java eqeq 5 5
+eq.scala, no -optimise
+eq$		109		78		79		63		63
+eq$		94		63		63		78		78
+eq$		94		62		62		62		78
+eq$		94		78		78		78		78
+eq$		94		78		78		78		78
+eq.scala, with -optimise
+eq$		421		63		62		47		63
+eq$		406		62		62		63		62
+eq$		407		62		62		78		63
+eq$		406		63		63		62		62
+eq$		407		62		62		63		47
+eqeq.scala with version of BoxesRuntime as of Nov 13th, no -optimise
+eqeq$		562		516		516		516		515
+eqeq$		547		515		515		531		532
+eqeq$		532		516		516		515		516
+eqeq$		547		531		531		516		531
+eqeq$		547		515		515		516		516
+eqeq.scala with version of BoxesRuntime as of Nov 13th, with -optimise
+eqeq$		1031		390		391		391		391
+eqeq$		1031		391		391		391		390
+eqeq$		1031		390		390		391		391
+eqeq$		1031		406		407		391		390
+eqeq$		1031		390		390		391		391
+eqeq.scala with 1st optimized of Nov 14th, no -optimise
+eqeq$		484		421		438		438		437
+eqeq$		484		438		437		437		438
+eqeq$		469		437		453		454		438
+eqeq$		468		437		438		468		438
+eqeq$		485		437		437		422		438
+eqeq.scala with 1st optimized of Nov 14th, with -optimise
+eqeq$		1016		375		391		375		375
+eqeq$		1016		375		391		390		375
+eqeq$		1016		390		391		375		375
+eqeq$		1015		375		391		390		375
+eqeq$		1016		390		375		375		375