Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10

* origin/2.10.0-wip:
  MethodSymbol.params => MethodSymbol.paramss
  SI-6471 Update jquery from 1.4.2 to 1.8.2
  undeprecates manifests for 2.10.0
  SI-6451: Rename classes in `unchecked-abstract.scala` test.
  Put more implementation restrictions on value classes.
  Fixed problem in SI-6408
  Revised restrictions for value classes and unversal traits
  SI-6436 Handle ambiguous string processors
  fixes a bug in a weak cache in runtime reflection

Conflicts:
	test/files/neg/classmanifests_new_deprecations.check
	test/files/neg/unchecked-abstract.check

1 files changed, 1 insertions, 31 deletions

diff --git a/test/files/neg/classmanifests_new_deprecations.check b/test/files/neg/classmanifests_new_deprecations.check
index 2301947b04..fddd6bf5b4 100644
--- a/test/files/neg/classmanifests_new_deprecations.check
+++ b/test/files/neg/classmanifests_new_deprecations.check
@@ -28,36 +28,6 @@ classmanifests_new_deprecations.scala:10: warning: type ClassManifest in object
 classmanifests_new_deprecations.scala:15: warning: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead
   type RCM[T] = scala.reflect.ClassManifest[T]
                               ^
-classmanifests_new_deprecations.scala:20: warning: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
-  def m1[T: Manifest] = ???
-          ^
-classmanifests_new_deprecations.scala:21: warning: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
-  def m2[T](implicit evidence$1: Manifest[T]) = ???
-                                 ^
-classmanifests_new_deprecations.scala:22: warning: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
-  val m3: Manifest[Int] = null
-          ^
-classmanifests_new_deprecations.scala:22: warning: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
-  val m3: Manifest[Int] = null
-      ^
-classmanifests_new_deprecations.scala:24: warning: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
-  def rm1[T: scala.reflect.Manifest] = ???
-           ^
-classmanifests_new_deprecations.scala:25: warning: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
-  def rm2[T](implicit evidence$1: scala.reflect.Manifest[T]) = ???
-                                                ^
-classmanifests_new_deprecations.scala:26: warning: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
-  val rm3: scala.reflect.Manifest[Int] = null
-                         ^
-classmanifests_new_deprecations.scala:26: warning: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
-  val rm3: scala.reflect.Manifest[Int] = null
-      ^
-classmanifests_new_deprecations.scala:28: warning: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
-  type M[T] = Manifest[T]
-              ^
-classmanifests_new_deprecations.scala:33: warning: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
-  type RM[T] = scala.reflect.Manifest[T]
-                             ^
 error: No warnings can be incurred under -Xfatal-warnings.
-20 warnings found
+10 warnings found
 one error found