diff options
| author | Matei Zaharia <matei@databricks.com> | 2014-01-01 13:28:54 -0500 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-01-01 13:28:54 -0500 |
| commit | 0e5b2adb5c4f2ab1bba275bb3cb2dc2643828f4f (patch) | |
| tree | da596b21b4e5cf4aa2cc998a254ca76af7be7637 /project/SparkBuild.scala | |
| parent | 42bcfb2bb2b532dc12e13d3cfc1b4556bbb2c43c (diff) | |
| parent | 9a0ff721c9e4c8f52aadfdde6ac2764d3cba9797 (diff) | |
| download | spark-0e5b2adb5c4f2ab1bba275bb3cb2dc2643828f4f.tar.gz spark-0e5b2adb5c4f2ab1bba275bb3cb2dc2643828f4f.tar.bz2 spark-0e5b2adb5c4f2ab1bba275bb3cb2dc2643828f4f.zip | |
Merge remote-tracking branch 'apache/master' into conf2
Conflicts:
project/SparkBuild.scala
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 204662f74f..2eef2dfa5e 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -248,7 +248,8 @@ object SparkBuild extends Build { "com.codahale.metrics" % "metrics-graphite" % "3.0.0", "com.twitter" %% "chill" % "0.3.1", "com.twitter" % "chill-java" % "0.3.1", - "com.typesafe" % "config" % "1.0.2" + "com.typesafe" % "config" % "1.0.2", + "com.clearspring.analytics" % "stream" % "2.5.1" ) ) |