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

5 files changed, 27 insertions, 17 deletions

diff --git a/tools/binary-repo-lib.sh b/tools/binary-repo-lib.sh
index 7bc280b745..704bf4944d 100755
--- a/tools/binary-repo-lib.sh
+++ b/tools/binary-repo-lib.sh
@@ -191,7 +191,7 @@ pullJarFileToCache() {
   if [[ ! -f "$cache_loc" ]]; then
     # Note: After we follow up with JFrog, we should check the more stable raw file server first
     # before hitting the more flaky artifactory.
-    curlDownload $cache_loc ${remote_urlpush}/${uri}
+    curlDownload $cache_loc ${remote_urlget}/${uri}
     if test "$(checkJarSha "$cache_loc" "$sha")" != "OK"; then
       echo "Trouble downloading $uri.  Please try pull-binary-libs again when your internet connection is stable."
       exit 2
diff --git a/tools/class-dump b/tools/class-dump
new file mode 100755
index 0000000000..06a7e5acbc
--- /dev/null
+++ b/tools/class-dump
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+
+JAVAP_OPTS="-private"
+
+[[ -n "$1" ]] && ( cd "$(dirname "$1")" && javap $JAVAP_OPTS "$(basename "${1%%.class}")" )
diff --git a/tools/get-scala-commit-date.bat b/tools/get-scala-commit-date.bat
index 2a75073633..e169de1b04 100644
--- a/tools/get-scala-commit-date.bat
+++ b/tools/get-scala-commit-date.bat
@@ -1,9 +1,9 @@
-@echo off

-for %%X in (bash.exe) do (set FOUND=%%~$PATH:X)

-if defined FOUND (

-  bash "%~dp0\get-scala-commit-date"

-) else (

-  rem echo this script does not work with cmd.exe. please, install bash

-  echo unknown

-  exit 1

+@echo off
+for %%X in (bash.exe) do (set FOUND=%%~$PATH:X)
+if defined FOUND (
+  bash "%~dp0\get-scala-commit-date"
+) else (
+  rem echo this script does not work with cmd.exe. please, install bash
+  echo unknown
+  exit 1
 )
\ No newline at end of file
diff --git a/tools/get-scala-commit-sha.bat b/tools/get-scala-commit-sha.bat
index 390e2d99d0..1eaffc0a15 100644
--- a/tools/get-scala-commit-sha.bat
+++ b/tools/get-scala-commit-sha.bat
@@ -1,9 +1,9 @@
-@echo off

-for %%X in (bash.exe) do (set FOUND=%%~$PATH:X)

-if defined FOUND (

-  bash "%~dp0\get-scala-commit-sha"

-) else (

-  rem echo this script does not work with cmd.exe. please, install bash

-  echo unknown

-  exit 1

+@echo off
+for %%X in (bash.exe) do (set FOUND=%%~$PATH:X)
+if defined FOUND (
+  bash "%~dp0\get-scala-commit-sha"
+) else (
+  rem echo this script does not work with cmd.exe. please, install bash
+  echo unknown
+  exit 1
 )
\ No newline at end of file
diff --git a/tools/jar-dump b/tools/jar-dump
new file mode 100755
index 0000000000..166441b330
--- /dev/null
+++ b/tools/jar-dump
@@ -0,0 +1,4 @@
+#!/bin/sh
+#
+
+jar tf "$1" | sort