You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spot.apache.org by nl...@apache.org on 2017/06/19 22:41:48 UTC
[6/6] incubator-spot git commit: SPOT-160 [ML] Upgrade spot-ml Spark
2.1
SPOT-160 [ML] Upgrade spot-ml Spark 2.1
- This commit considers rabarona feedback regarding the commented line in build.sbt
- It also added back a legend about the code originally copied from the TAP project.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spot/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spot/commit/00db9e70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spot/tree/00db9e70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spot/diff/00db9e70
Branch: refs/heads/master
Commit: 00db9e7064744c5a295d5186150df353eddeb232
Parents: bdc4c8e
Author: lujangus <gu...@intel.com>
Authored: Mon Jun 19 13:28:06 2017 -0500
Committer: lujangus <gu...@intel.com>
Committed: Mon Jun 19 13:28:06 2017 -0500
----------------------------------------------------------------------
spot-ml/build.sbt | 1 -
.../scala/org/apache/spot/testutils/TestingSparkContext.scala | 5 +++++
.../org/apache/spot/testutils/TestingSparkContextFlatSpec.scala | 4 ++++
.../org/apache/spot/testutils/TestingSparkContextFunSuite.scala | 5 ++++-
.../org/apache/spot/testutils/TestingSparkContextWordSpec.scala | 5 +++++
5 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/00db9e70/spot-ml/build.sbt
----------------------------------------------------------------------
diff --git a/spot-ml/build.sbt b/spot-ml/build.sbt
index e995162..0ac6e60 100644
--- a/spot-ml/build.sbt
+++ b/spot-ml/build.sbt
@@ -49,7 +49,6 @@ mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) => {
case "about.html" => MergeStrategy.rename
case meta(_) => MergeStrategy.discard
case x => MergeStrategy.first
- //case x => old(x)
}
}
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/00db9e70/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContext.scala
----------------------------------------------------------------------
diff --git a/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContext.scala b/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContext.scala
index 70ab71b..91ad61d 100644
--- a/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContext.scala
+++ b/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContext.scala
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * THIS CODE WAS ORIGINALLY COPIED DIRECTLY FROM THE OPEN SOURCE PROJECT TAP (Trusted Analytics Platform)
+ * which has an Apache V2.0. IT WAS LATER UPDATED TO SUPPORT SPARK 2.1 SparkSession
+ */
+
package org.apache.spot.testutils
import java.util.concurrent.locks.ReentrantLock
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/00db9e70/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextFlatSpec.scala
----------------------------------------------------------------------
diff --git a/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextFlatSpec.scala b/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextFlatSpec.scala
index 8d2f441..b170078 100644
--- a/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextFlatSpec.scala
+++ b/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextFlatSpec.scala
@@ -15,6 +15,10 @@
* limitations under the License.
*/
+/**
+ * THIS CODE WAS ORIGINALLY COPIED DIRECTLY FROM THE OPEN SOURCE PROJECT TAP (Trusted Analytics Platform)
+ * which has an Apache V2.0. IT WAS LATER UPDATED TO SUPPORT SPARK 2.1 SparkSession
+ */
package org.apache.spot.testutils
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/00db9e70/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextFunSuite.scala
----------------------------------------------------------------------
diff --git a/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextFunSuite.scala b/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextFunSuite.scala
index d948f56..2362aee 100644
--- a/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextFunSuite.scala
+++ b/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextFunSuite.scala
@@ -15,7 +15,10 @@
* limitations under the License.
*/
-
+/**
+ * THIS CODE WAS ORIGINALLY COPIED DIRECTLY FROM THE OPEN SOURCE PROJECT TAP (Trusted Analytics Platform)
+ * which has an Apache V2.0. IT WAS LATER UPDATED TO SUPPORT SPARK 2.1 SparkSession
+ */
package org.apache.spot.testutils
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/00db9e70/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextWordSpec.scala
----------------------------------------------------------------------
diff --git a/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextWordSpec.scala b/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextWordSpec.scala
index 0b8a03a..4234448 100644
--- a/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextWordSpec.scala
+++ b/spot-ml/src/test/scala/org/apache/spot/testutils/TestingSparkContextWordSpec.scala
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+ * THIS CODE WAS ORIGINALLY COPIED DIRECTLY FROM THE OPEN SOURCE PROJECT TAP (Trusted Analytics Platform)
+ * which has an Apache V2.0. IT WAS LATER UPDATED TO SUPPORT SPARK 2.1 SparkSession
+ */
+
package org.apache.spot.testutils
import org.apache.spark.sql.SparkSession