Repository: zeppelin Updated Branches: refs/heads/branch-0.6 d5d05dcfa -> aa5068f5e
[MINOR] Make scala version definition consistent in Travis.CI configuration ### What is this PR for? Minor cleanup to make scala version definition consistent in the Travis.CI configuration ### What type of PR is it? [Bug Fix] Author: Luciano Resende <[email protected]> Closes #1220 from lresende/travis and squashes the following commits: 91c1fc0 [Luciano Resende] [MINOR] Make scala version profiles consistent (cherry picked from commit 2696930ed381eb522fa92ae8b09d28e4d4889d40) Signed-off-by: Mina Lee <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/aa5068f5 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/aa5068f5 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/aa5068f5 Branch: refs/heads/branch-0.6 Commit: aa5068f5e44300a8a9da188302846be520ed3e42 Parents: d5d05dc Author: Luciano Resende <[email protected]> Authored: Fri Jul 22 07:02:03 2016 -0700 Committer: Mina Lee <[email protected]> Committed: Fri Jul 29 15:34:45 2016 +0900 ---------------------------------------------------------------------- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/aa5068f5/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index de0e5dc..227847f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ matrix: # Test all modules with scala 2.10 - jdk: "oraclejdk7" - env: SCALA_VER="2.10" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" + env: SCALA_VER="2.10" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.10" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" # Test all modules with scala 2.11 - jdk: "oraclejdk7" @@ -105,4 +105,3 @@ after_failure: after_script: - ./testing/stopSparkCluster.sh $SPARK_VER $HADOOP_VER -
