Repository: spark Updated Branches: refs/heads/branch-1.6 60cb27040 -> 07ace27cb
[SPARK-13663][CORE] Upgrade Snappy Java to 1.1.2.1 Update snappy to 1.1.2.1 to pull in a single fix -- the OOM fix we already worked around. Supersedes https://github.com/apache/spark/pull/11524 Jenkins tests. Author: Sean Owen <so...@cloudera.com> Closes #11631 from srowen/SPARK-13663. (cherry picked from commit 927e22eff894cb9b4fe8e5de3578517997292a8a) Signed-off-by: Sean Owen <so...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/07ace27c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/07ace27c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/07ace27c Branch: refs/heads/branch-1.6 Commit: 07ace27cb738d2fe46b0823e543e34e0b10b2a64 Parents: 60cb270 Author: Sean Owen <so...@cloudera.com> Authored: Thu Mar 10 15:17:37 2016 +0000 Committer: Sean Owen <so...@cloudera.com> Committed: Thu Mar 10 15:27:08 2016 +0000 ---------------------------------------------------------------------- dev/deps/spark-deps-hadoop-1 | 2 +- dev/deps/spark-deps-hadoop-2.2 | 2 +- dev/deps/spark-deps-hadoop-2.3 | 2 +- dev/deps/spark-deps-hadoop-2.4 | 2 +- dev/deps/spark-deps-hadoop-2.6 | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/07ace27c/dev/deps/spark-deps-hadoop-1 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-1 b/dev/deps/spark-deps-hadoop-1 index a8ae660..3aa0fcb 100644 --- a/dev/deps/spark-deps-hadoop-1 +++ b/dev/deps/spark-deps-hadoop-1 @@ -143,7 +143,7 @@ servlet-api-2.5.jar slf4j-api-1.7.10.jar slf4j-log4j12-1.7.10.jar snappy-0.2.jar -snappy-java-1.1.2.jar +snappy-java-1.1.2.1.jar spire-macros_2.10-0.7.4.jar spire_2.10-0.7.4.jar stax-api-1.0.1.jar http://git-wip-us.apache.org/repos/asf/spark/blob/07ace27c/dev/deps/spark-deps-hadoop-2.2 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2 index ca75f91..62921b7 100644 --- a/dev/deps/spark-deps-hadoop-2.2 +++ b/dev/deps/spark-deps-hadoop-2.2 @@ -173,7 +173,7 @@ servlet-api-2.5.jar slf4j-api-1.7.10.jar slf4j-log4j12-1.7.10.jar snappy-0.2.jar -snappy-java-1.1.2.jar +snappy-java-1.1.2.1.jar spire-macros_2.10-0.7.4.jar spire_2.10-0.7.4.jar stax-api-1.0.1.jar http://git-wip-us.apache.org/repos/asf/spark/blob/07ace27c/dev/deps/spark-deps-hadoop-2.3 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 index 208ff53..29fd027 100644 --- a/dev/deps/spark-deps-hadoop-2.3 +++ b/dev/deps/spark-deps-hadoop-2.3 @@ -164,7 +164,7 @@ servlet-api-2.5.jar slf4j-api-1.7.10.jar slf4j-log4j12-1.7.10.jar snappy-0.2.jar -snappy-java-1.1.2.jar +snappy-java-1.1.2.1.jar spire-macros_2.10-0.7.4.jar spire_2.10-0.7.4.jar stax-api-1.0-2.jar http://git-wip-us.apache.org/repos/asf/spark/blob/07ace27c/dev/deps/spark-deps-hadoop-2.4 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 index e7075f8..30b5746 100644 --- a/dev/deps/spark-deps-hadoop-2.4 +++ b/dev/deps/spark-deps-hadoop-2.4 @@ -165,7 +165,7 @@ servlet-api-2.5.jar slf4j-api-1.7.10.jar slf4j-log4j12-1.7.10.jar snappy-0.2.jar -snappy-java-1.1.2.jar +snappy-java-1.1.2.1.jar spire-macros_2.10-0.7.4.jar spire_2.10-0.7.4.jar stax-api-1.0-2.jar http://git-wip-us.apache.org/repos/asf/spark/blob/07ace27c/dev/deps/spark-deps-hadoop-2.6 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6 index 5ebf5d3..30f1366 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -171,7 +171,7 @@ servlet-api-2.5.jar slf4j-api-1.7.10.jar slf4j-log4j12-1.7.10.jar snappy-0.2.jar -snappy-java-1.1.2.jar +snappy-java-1.1.2.1.jar spire-macros_2.10-0.7.4.jar spire_2.10-0.7.4.jar stax-api-1.0-2.jar http://git-wip-us.apache.org/repos/asf/spark/blob/07ace27c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e6e2ad7..57ccae8 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ <jline.groupid>org.scala-lang</jline.groupid> <codehaus.jackson.version>1.9.13</codehaus.jackson.version> <fasterxml.jackson.version>2.4.4</fasterxml.jackson.version> - <snappy.version>1.1.2</snappy.version> + <snappy.version>1.1.2.1</snappy.version> <netlib.java.version>1.1.2</netlib.java.version> <calcite.version>1.2.0-incubating</calcite.version> <commons-codec.version>1.10</commons-codec.version> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
