From 38c8d638e6e3d799f278c87883c2a0d354ac18c5 Mon Sep 17 00:00:00 2001 From: William Benton Date: Mar 25 2014 17:46:38 +0000 Subject: don't remove streamlib in patch --- diff --git a/spark-v0.9.0-0008-remove-unavailable-and-unnecessary-deps.patch b/spark-v0.9.0-0008-remove-unavailable-and-unnecessary-deps.patch index 6832c2c..c6a1533 100644 --- a/spark-v0.9.0-0008-remove-unavailable-and-unnecessary-deps.patch +++ b/spark-v0.9.0-0008-remove-unavailable-and-unnecessary-deps.patch @@ -1,14 +1,3 @@ -From 73a6adeaa4f763b09ff25451825f05faa3caafb4 Mon Sep 17 00:00:00 2001 -From: William Benton -Date: Fri, 28 Feb 2014 09:00:04 -0600 -Subject: [PATCH] remove unavailable and unnecessary deps - ---- - project/SparkBuild.scala | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) - -diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala -index 068bf74..956312f 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -183,13 +183,7 @@ object SparkBuild extends Build { @@ -40,18 +29,6 @@ index 068bf74..956312f 100644 "org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib), "org.apache.avro" % "avro" % "1.7.4", "org.apache.avro" % "avro-ipc" % "1.7.4" excludeAll(excludeNetty), -@@ -248,10 +240,7 @@ object SparkBuild extends Build { - "com.codahale.metrics" % "metrics-jvm" % "3.0.0", - "com.codahale.metrics" % "metrics-json" % "3.0.0", - "com.codahale.metrics" % "metrics-ganglia" % "3.0.0", -- "com.codahale.metrics" % "metrics-graphite" % "3.0.0", -- "com.twitter" %% "chill" % "0.3.1", -- "com.twitter" % "chill-java" % "0.3.1", -- "com.clearspring.analytics" % "stream" % "2.5.1" -+ "com.codahale.metrics" % "metrics-graphite" % "3.0.0" - ) - ) - -- 1.8.3.4 (Apple Git-47)