svn commit: r16482 - in /dev/zeppelin: zeppelin-0.6.2-rc1/ zeppelin-0.6.2-rc2/
Author: minalee Date: Wed Oct 12 10:03:40 2016 New Revision: 16482 Log: Upload zeppelin-0.6.2-rc2 Added: dev/zeppelin/zeppelin-0.6.2-rc2/ dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz (with props) dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz.asc dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz.md5 dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz.sha512 dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-netinst.tgz (with props) dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-netinst.tgz.asc dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-netinst.tgz.md5 dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-netinst.tgz.sha512 dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2.tgz (with props) dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2.tgz.asc dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2.tgz.md5 dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2.tgz.sha512 Removed: dev/zeppelin/zeppelin-0.6.2-rc1/ Added: dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz == Binary file - no diff available. Propchange: dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz -- svn:mime-type = application/octet-stream Added: dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz.asc == --- dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz.asc (added) +++ dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz.asc Wed Oct 12 10:03:40 2016 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQEcBAABCAAGBQJX/fpPAAoJEFUT+cHcct1fVtoH/2W6Hc1StZ4FIqEtCwjUi+Bc +qFDDTG9meDyEyLbDhWoznkmFWzutsgLplkdN5oxEvXIeGHfs3jg5fiYbf3hRUgFs +UhkQzsGg1DHou6vvQQffsyFsIEFrVngw3MZ3GwhrNiCXQAyF42gwlleCSoNgWOCF +0BV/xlZ0MLzTY1CNlmw2iqDHLMxoMpi8Ks7K+aZFkJvZLOJDJ2LhGjeR+7KnWWEc +5bjEeXDgglC1Kj5MeJyBEjYrdClFLFUlCS1O37Zh8iOC70ZUSWl7NzqStnZ3P+VN +wAC485jr66a6eWyU6UBMJi0dDDZ4ICAmwVhcFOSgAnXanG0aHVr62eTiuWjw4ow= +=n0Ab +-END PGP SIGNATURE- Added: dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz.md5 == --- dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz.md5 (added) +++ dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz.md5 Wed Oct 12 10:03:40 2016 @@ -0,0 +1 @@ +zeppelin-0.6.2-bin-all.tgz: CE 6C E3 DD AF AE EB 40 F8 AE FF 8F 7E 73 46 2F Added: dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz.sha512 == --- dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz.sha512 (added) +++ dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-all.tgz.sha512 Wed Oct 12 10:03:40 2016 @@ -0,0 +1 @@ +28040372a4a5dc127f68f54c9c3566537e7ee4d74714e0799d6c992663fe44c521518fa09bca315c9bfb9aed807bcd31e51eee157fe9ef01499d1e23d2908284 zeppelin-0.6.2-bin-all.tgz Added: dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-netinst.tgz == Binary file - no diff available. Propchange: dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-netinst.tgz -- svn:mime-type = application/octet-stream Added: dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-netinst.tgz.asc == --- dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-netinst.tgz.asc (added) +++ dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-netinst.tgz.asc Wed Oct 12 10:03:40 2016 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQEcBAABCAAGBQJX/fugAAoJEFUT+cHcct1fjfwH/1Nb29eQ3oSReeJmUpYl2rwm +u4eS9Vns4YrdEekel5ivaqwy9n9simjuKTafET9GSXCHmI1CIFQICPtQH+HZGt5W +M08Kprxk8qodLlmh81WwUWmryFeH/BC2DM/jT836KlI2HuuGsCBbEf3HvHY+Vupl +KnrsiICm/gBA0lS9aOTlnDyXw9QXJez21a+dWymfFFojWHPgPfYu41va6SdLlRtB +cSjgygq5ttlG100y4WtaqQeG1SUAyArRfclmhmIQrtiT59jsG+ICGexvaCMu0QDV +d9OJQyXtB6lTBw5ev85uhrAeHUtncsOZMKnRiq/xl756KW9TDBStBpSDfBz5KUo= +=Adq/ +-END PGP SIGNATURE- Added: dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-netinst.tgz.md5 == --- dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-netinst.tgz.md5 (added) +++ dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-netinst.tgz.md5 Wed Oct 12 10:03:40 2016 @@ -0,0 +1 @@ +zeppelin-0.6.2-bin-netinst.tgz: DC B5 98 2E 45 F6 A7 86 3A 3B 77 5C E0 AF 77 76 Added: dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-netinst.tgz.sha512 == --- dev/zeppelin/zeppelin-0.6.2-rc2/zeppelin-0.6.2-bin-netinst.tgz.sha512
[2/2] zeppelin git commit: Preparing development version 0.6.3-SNAPSHOT
Preparing development version 0.6.3-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c6edc0b7 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c6edc0b7 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c6edc0b7 Branch: refs/heads/branch-0.6 Commit: c6edc0b7c9a27e75ff28c24e8bbc4b19d291d0c1 Parents: 091086d Author: Mina LeeAuthored: Wed Oct 12 17:19:34 2016 +0900 Committer: Mina Lee Committed: Wed Oct 12 17:19:34 2016 +0900 -- alluxio/pom.xml | 4 ++-- angular/pom.xml | 4 ++-- bigquery/pom.xml | 4 ++-- cassandra/pom.xml | 4 ++-- elasticsearch/pom.xml | 4 ++-- file/pom.xml | 4 ++-- flink/pom.xml | 4 ++-- geode/pom.xml | 4 ++-- hbase/pom.xml | 4 ++-- ignite/pom.xml| 4 ++-- jdbc/pom.xml | 4 ++-- kylin/pom.xml | 4 ++-- lens/pom.xml | 4 ++-- livy/pom.xml | 4 ++-- markdown/pom.xml | 4 ++-- pom.xml | 2 +- postgresql/pom.xml| 4 ++-- python/pom.xml| 4 ++-- r/pom.xml | 2 +- scalding/pom.xml | 4 ++-- shell/pom.xml | 4 ++-- spark-dependencies/pom.xml| 4 ++-- spark/pom.xml | 4 ++-- zeppelin-display/pom.xml | 4 ++-- zeppelin-distribution/pom.xml | 2 +- zeppelin-interpreter/pom.xml | 4 ++-- zeppelin-server/pom.xml | 4 ++-- zeppelin-web/pom.xml | 4 ++-- zeppelin-zengine/pom.xml | 4 ++-- 29 files changed, 55 insertions(+), 55 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c6edc0b7/alluxio/pom.xml -- diff --git a/alluxio/pom.xml b/alluxio/pom.xml index 8f2dee4..22c682b 100644 --- a/alluxio/pom.xml +++ b/alluxio/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.6.2 +0.6.3-SNAPSHOT .. org.apache.zeppelin zeppelin-alluxio jar -0.6.2 +0.6.3-SNAPSHOT Zeppelin: Alluxio interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c6edc0b7/angular/pom.xml -- diff --git a/angular/pom.xml b/angular/pom.xml index ee85669..b6cf53e 100644 --- a/angular/pom.xml +++ b/angular/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.6.2 +0.6.3-SNAPSHOT .. org.apache.zeppelin zeppelin-angular jar - 0.6.2 + 0.6.3-SNAPSHOT Zeppelin: Angular interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c6edc0b7/bigquery/pom.xml -- diff --git a/bigquery/pom.xml b/bigquery/pom.xml index a16e36f..b18b64a 100644 --- a/bigquery/pom.xml +++ b/bigquery/pom.xml @@ -23,13 +23,13 @@ zeppelin org.apache.zeppelin -0.6.2 +0.6.3-SNAPSHOT org.apache.zeppelin zeppelin-bigquery jar - 0.6.2 + 0.6.3-SNAPSHOT Zeppelin: BigQuery interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c6edc0b7/cassandra/pom.xml -- diff --git a/cassandra/pom.xml b/cassandra/pom.xml index c7a33cf..670c722 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.6.2 +0.6.3-SNAPSHOT .. org.apache.zeppelin zeppelin-cassandra_2.10 jar -0.6.2 +0.6.3-SNAPSHOT Zeppelin: Apache Cassandra interpreter Zeppelin cassandra support http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c6edc0b7/elasticsearch/pom.xml -- diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml index c320e7f..fbf025b 100644 --- a/elasticsearch/pom.xml +++ b/elasticsearch/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.6.2 +0.6.3-SNAPSHOT .. org.apache.zeppelin zeppelin-elasticsearch jar - 0.6.2 + 0.6.3-SNAPSHOT Zeppelin: Elasticsearch interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c6edc0b7/file/pom.xml -- diff --git a/file/pom.xml b/file/pom.xml index 6c8ab0a..9b1d7a2 100644 --- a/file/pom.xml +++ b/file/pom.xml @@ -22,13 +22,13 @@ zeppelin org.apache.zeppelin -0.6.2 +0.6.3-SNAPSHOT org.apache.zeppelin zeppelin-file jar - 0.6.2 +
[1/2] zeppelin git commit: Preparing Aapche Zeppelin release 0.6.2
Repository: zeppelin Updated Branches: refs/heads/branch-0.6 cc914083b -> c6edc0b7c Preparing Aapche Zeppelin release 0.6.2 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/091086de Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/091086de Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/091086de Branch: refs/heads/branch-0.6 Commit: 091086de9400dd1c02ca02acf4180b1bf1e9ede7 Parents: cc91408 Author: Mina LeeAuthored: Wed Oct 12 17:18:40 2016 +0900 Committer: Mina Lee Committed: Wed Oct 12 17:18:40 2016 +0900 -- alluxio/pom.xml | 4 ++-- angular/pom.xml | 4 ++-- bigquery/pom.xml | 4 ++-- cassandra/pom.xml | 4 ++-- elasticsearch/pom.xml | 4 ++-- file/pom.xml | 4 ++-- flink/pom.xml | 4 ++-- geode/pom.xml | 4 ++-- hbase/pom.xml | 4 ++-- ignite/pom.xml| 4 ++-- jdbc/pom.xml | 4 ++-- kylin/pom.xml | 4 ++-- lens/pom.xml | 4 ++-- livy/pom.xml | 4 ++-- markdown/pom.xml | 4 ++-- pom.xml | 2 +- postgresql/pom.xml| 4 ++-- python/pom.xml| 4 ++-- r/pom.xml | 2 +- scalding/pom.xml | 4 ++-- shell/pom.xml | 4 ++-- spark-dependencies/pom.xml| 4 ++-- spark/pom.xml | 4 ++-- zeppelin-display/pom.xml | 4 ++-- zeppelin-distribution/pom.xml | 2 +- zeppelin-interpreter/pom.xml | 4 ++-- zeppelin-server/pom.xml | 4 ++-- zeppelin-web/pom.xml | 4 ++-- zeppelin-zengine/pom.xml | 4 ++-- 29 files changed, 55 insertions(+), 55 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/091086de/alluxio/pom.xml -- diff --git a/alluxio/pom.xml b/alluxio/pom.xml index 22c682b..8f2dee4 100644 --- a/alluxio/pom.xml +++ b/alluxio/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.6.3-SNAPSHOT +0.6.2 .. org.apache.zeppelin zeppelin-alluxio jar -0.6.3-SNAPSHOT +0.6.2 Zeppelin: Alluxio interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/091086de/angular/pom.xml -- diff --git a/angular/pom.xml b/angular/pom.xml index b6cf53e..ee85669 100644 --- a/angular/pom.xml +++ b/angular/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.6.3-SNAPSHOT +0.6.2 .. org.apache.zeppelin zeppelin-angular jar - 0.6.3-SNAPSHOT + 0.6.2 Zeppelin: Angular interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/091086de/bigquery/pom.xml -- diff --git a/bigquery/pom.xml b/bigquery/pom.xml index b18b64a..a16e36f 100644 --- a/bigquery/pom.xml +++ b/bigquery/pom.xml @@ -23,13 +23,13 @@ zeppelin org.apache.zeppelin -0.6.3-SNAPSHOT +0.6.2 org.apache.zeppelin zeppelin-bigquery jar - 0.6.3-SNAPSHOT + 0.6.2 Zeppelin: BigQuery interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/091086de/cassandra/pom.xml -- diff --git a/cassandra/pom.xml b/cassandra/pom.xml index 670c722..c7a33cf 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.6.3-SNAPSHOT +0.6.2 .. org.apache.zeppelin zeppelin-cassandra_2.10 jar -0.6.3-SNAPSHOT +0.6.2 Zeppelin: Apache Cassandra interpreter Zeppelin cassandra support http://git-wip-us.apache.org/repos/asf/zeppelin/blob/091086de/elasticsearch/pom.xml -- diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml index fbf025b..c320e7f 100644 --- a/elasticsearch/pom.xml +++ b/elasticsearch/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.6.3-SNAPSHOT +0.6.2 .. org.apache.zeppelin zeppelin-elasticsearch jar - 0.6.3-SNAPSHOT + 0.6.2 Zeppelin: Elasticsearch interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/091086de/file/pom.xml -- diff --git a/file/pom.xml b/file/pom.xml index 9b1d7a2..6c8ab0a 100644 --- a/file/pom.xml +++ b/file/pom.xml @@ -22,13 +22,13 @@ zeppelin org.apache.zeppelin -0.6.3-SNAPSHOT +
[zeppelin] Git Push Summary
Repository: zeppelin Updated Tags: refs/tags/v0.6.2-rc2 [created] 091086de9
zeppelin git commit: [HOTFIX] Set default ZEPPELIN_INTP_MEM
Repository: zeppelin Updated Branches: refs/heads/branch-0.6 d5504a878 -> cc914083b [HOTFIX] Set default ZEPPELIN_INTP_MEM This PR sets default value for ZEPPELIN_INTP_MEM to avoid OOM Exception in SparkInterpreter when Zeppelin has zero configuration. This PR should be merged to both branch-0.6 and master. Bug Fix 1. Build with: ``` mvn clean package -DskipTests -pl '!zeppelin-distribution,!file,!alluxio,!livy,!hbase,!bigquery,!python,!jdbc,!ignite,!lens,!postgresql,!cassandra,!kylin,!elasticsearch,!flink,!markdown,!shell,!angular' ``` 2. Unset SPARK_HOME in conf/zeppelin-env.sh if you have. 3. Run Zeppelin with java 1.7. 4. Run tutorial and see if it doesn't hang. * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Mina LeeCloses #1505 from minahlee/hotfix/default_intp_jvm and squashes the following commits: 0dfda4f [Mina Lee] Set default ZEPPELIN_INTP_MEM (cherry picked from commit abd95fa5e4a760ee19eb5597bf1bcaabdcd7b0ea) Signed-off-by: Mina Lee Conflicts: docs/install/upgrade.md Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/cc914083 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/cc914083 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/cc914083 Branch: refs/heads/branch-0.6 Commit: cc914083b83964cebc0f6b287682f3e2bf96c613 Parents: d5504a8 Author: Mina Lee Authored: Tue Oct 11 19:13:52 2016 +0900 Committer: Mina Lee Committed: Wed Oct 12 16:52:04 2016 +0900 -- bin/common.cmd | 4 bin/common.sh | 6 +- conf/zeppelin-env.cmd.template | 4 ++-- conf/zeppelin-env.sh.template | 4 ++-- docs/install/upgrade.md| 6 -- 5 files changed, 13 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/cc914083/bin/common.cmd -- diff --git a/bin/common.cmd b/bin/common.cmd index b4fb6bf..745750f 100644 --- a/bin/common.cmd +++ b/bin/common.cmd @@ -69,6 +69,10 @@ if not defined ZEPPELIN_MEM ( set ZEPPELIN_MEM=-Xms1024m -Xmx1024m -XX:MaxPermSize=512m ) +if not defined ZEPPELIN_INTP_MEM ( +set ZEPPELIN_INTP_MEM=-Xms1024m -Xmx1024m -XX:MaxPermSize=512m +) + if not defined ZEPPELIN_JAVA_OPTS ( set ZEPPELIN_JAVA_OPTS=-Dfile.encoding=%ZEPPELIN_ENCODING% %ZEPPELIN_MEM% ) else ( http://git-wip-us.apache.org/repos/asf/zeppelin/blob/cc914083/bin/common.sh -- diff --git a/bin/common.sh b/bin/common.sh index b69f28c..486d2b1 100644 --- a/bin/common.sh +++ b/bin/common.sh @@ -113,10 +113,14 @@ if [[ -z "${ZEPPELIN_ENCODING}" ]]; then export ZEPPELIN_ENCODING="UTF-8" fi -if [[ -z "$ZEPPELIN_MEM" ]]; then +if [[ -z "${ZEPPELIN_MEM}" ]]; then export ZEPPELIN_MEM="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m" fi +if [[ -z "${ZEPPELIN_INTP_MEM}" ]]; then + export ZEPPELIN_INTP_MEM="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m" +fi + JAVA_OPTS+=" ${ZEPPELIN_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING} ${ZEPPELIN_MEM}" JAVA_OPTS+=" -Dlog4j.configuration=file://${ZEPPELIN_CONF_DIR}/log4j.properties" export JAVA_OPTS http://git-wip-us.apache.org/repos/asf/zeppelin/blob/cc914083/conf/zeppelin-env.cmd.template -- diff --git a/conf/zeppelin-env.cmd.template b/conf/zeppelin-env.cmd.template index 9c7f7f7..5dd3aae 100644 --- a/conf/zeppelin-env.cmd.template +++ b/conf/zeppelin-env.cmd.template @@ -19,8 +19,8 @@ REM REM set JAVA_HOME= REM set MASTER=REM Spark master url. eg. spark://master_addr:7077. Leave empty if you want to use local mode. REM set ZEPPELIN_JAVA_OPTS REM Additional jvm options. for example, set ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g -Dspark.cores.max=16" -REM set ZEPPELIN_MEM REM Zeppelin jvm mem options Default -Xmx1024m -XX:MaxPermSize=512m -REM set ZEPPELIN_INTP_MEM REM zeppelin interpreter process jvm mem options. +REM set ZEPPELIN_MEM REM Zeppelin jvm mem options Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m +REM set ZEPPELIN_INTP_MEM REM zeppelin interpreter process jvm mem options. Default -Xmx1024m -Xms1024m -XX:MaxPermSize=512m REM set ZEPPELIN_INTP_JAVA_OPTSREM zeppelin interpreter process jvm options. REM set ZEPPELIN_LOG_DIR REM Where log files are stored. PWD by default.
zeppelin git commit: [BUILD][MINOR] Change build profile for distributing artifact to maven repository
Repository: zeppelin Updated Branches: refs/heads/branch-0.6 88e0d80ce -> d5504a878 [BUILD][MINOR] Change build profile for distributing artifact to maven repository ### What is this PR for? While removing duplication of specifying build profile in #1321, build profile has been changed from `-Ppublish-distr` to `-Pbuild-distr`. We need to restore this change and use `-Ppublish-distr` profile to publish `*.javadoc.jar ` and `*.sources.jar`. ### What type of PR is it? Hot Fix ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Mina LeeCloses #1506 from minahlee/build_profile and squashes the following commits: b84b371 [Mina Lee] Change build profile for distributing artifact to maven repository (cherry picked from commit 22bd851047c4ada20108754f3d15fbd8fe7b065a) Signed-off-by: Mina Lee Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/d5504a87 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/d5504a87 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/d5504a87 Branch: refs/heads/branch-0.6 Commit: d5504a878a7bf63c6219e92690fda6d6fcc436b2 Parents: 88e0d80 Author: Mina Lee Authored: Mon Oct 10 22:05:03 2016 +0900 Committer: Mina Lee Committed: Wed Oct 12 16:49:37 2016 +0900 -- dev/publish_release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d5504a87/dev/publish_release.sh -- diff --git a/dev/publish_release.sh b/dev/publish_release.sh index 3a0a0f5..fd1083a 100755 --- a/dev/publish_release.sh +++ b/dev/publish_release.sh @@ -44,7 +44,7 @@ NC='\033[0m' # No Color RELEASE_VERSION="$1" GIT_TAG="$2" -PUBLISH_PROFILES="-Pbuild-distr -Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr" +PUBLISH_PROFILES="-Ppublish-distr -Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr" PROJECT_OPTIONS="-pl !zeppelin-distribution" NEXUS_STAGING="https://repository.apache.org/service/local/staging; NEXUS_PROFILE="153446d1ac37c4"
zeppelin git commit: [BUILD][MINOR] Change build profile for distributing artifact to maven repository
Repository: zeppelin Updated Branches: refs/heads/master abd95fa5e -> 22bd85104 [BUILD][MINOR] Change build profile for distributing artifact to maven repository ### What is this PR for? While removing duplication of specifying build profile in #1321, build profile has been changed from `-Ppublish-distr` to `-Pbuild-distr`. We need to restore this change and use `-Ppublish-distr` profile to publish `*.javadoc.jar ` and `*.sources.jar`. ### What type of PR is it? Hot Fix ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Mina LeeCloses #1506 from minahlee/build_profile and squashes the following commits: b84b371 [Mina Lee] Change build profile for distributing artifact to maven repository Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/22bd8510 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/22bd8510 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/22bd8510 Branch: refs/heads/master Commit: 22bd851047c4ada20108754f3d15fbd8fe7b065a Parents: abd95fa Author: Mina Lee Authored: Mon Oct 10 22:05:03 2016 +0900 Committer: Mina Lee Committed: Wed Oct 12 16:49:20 2016 +0900 -- dev/publish_release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/22bd8510/dev/publish_release.sh -- diff --git a/dev/publish_release.sh b/dev/publish_release.sh index 3a0a0f5..fd1083a 100755 --- a/dev/publish_release.sh +++ b/dev/publish_release.sh @@ -44,7 +44,7 @@ NC='\033[0m' # No Color RELEASE_VERSION="$1" GIT_TAG="$2" -PUBLISH_PROFILES="-Pbuild-distr -Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr" +PUBLISH_PROFILES="-Ppublish-distr -Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr" PROJECT_OPTIONS="-pl !zeppelin-distribution" NEXUS_STAGING="https://repository.apache.org/service/local/staging; NEXUS_PROFILE="153446d1ac37c4"
zeppelin git commit: [HOTFIX] Set default ZEPPELIN_INTP_MEM
Repository: zeppelin Updated Branches: refs/heads/master d2f476d20 -> abd95fa5e [HOTFIX] Set default ZEPPELIN_INTP_MEM ### What is this PR for? This PR sets default value for ZEPPELIN_INTP_MEM to avoid OOM Exception in SparkInterpreter when Zeppelin has zero configuration. This PR should be merged to both branch-0.6 and master. ### What type of PR is it? Bug Fix ### How should this be tested? 1. Build with: ``` mvn clean package -DskipTests -pl '!zeppelin-distribution,!file,!alluxio,!livy,!hbase,!bigquery,!python,!jdbc,!ignite,!lens,!postgresql,!cassandra,!kylin,!elasticsearch,!flink,!markdown,!shell,!angular' ``` 2. Unset SPARK_HOME in conf/zeppelin-env.sh if you have. 3. Run Zeppelin with java 1.7. 4. Run tutorial and see if it doesn't hang. ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Mina LeeCloses #1505 from minahlee/hotfix/default_intp_jvm and squashes the following commits: 0dfda4f [Mina Lee] Set default ZEPPELIN_INTP_MEM Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/abd95fa5 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/abd95fa5 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/abd95fa5 Branch: refs/heads/master Commit: abd95fa5e4a760ee19eb5597bf1bcaabdcd7b0ea Parents: d2f476d Author: Mina Lee Authored: Tue Oct 11 19:13:52 2016 +0900 Committer: Mina Lee Committed: Wed Oct 12 16:44:53 2016 +0900 -- bin/common.cmd | 4 bin/common.sh | 6 +- conf/zeppelin-env.cmd.template | 4 ++-- conf/zeppelin-env.sh.template | 4 ++-- docs/install/upgrade.md| 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/abd95fa5/bin/common.cmd -- diff --git a/bin/common.cmd b/bin/common.cmd index b4fb6bf..745750f 100644 --- a/bin/common.cmd +++ b/bin/common.cmd @@ -69,6 +69,10 @@ if not defined ZEPPELIN_MEM ( set ZEPPELIN_MEM=-Xms1024m -Xmx1024m -XX:MaxPermSize=512m ) +if not defined ZEPPELIN_INTP_MEM ( +set ZEPPELIN_INTP_MEM=-Xms1024m -Xmx1024m -XX:MaxPermSize=512m +) + if not defined ZEPPELIN_JAVA_OPTS ( set ZEPPELIN_JAVA_OPTS=-Dfile.encoding=%ZEPPELIN_ENCODING% %ZEPPELIN_MEM% ) else ( http://git-wip-us.apache.org/repos/asf/zeppelin/blob/abd95fa5/bin/common.sh -- diff --git a/bin/common.sh b/bin/common.sh index b69f28c..486d2b1 100644 --- a/bin/common.sh +++ b/bin/common.sh @@ -113,10 +113,14 @@ if [[ -z "${ZEPPELIN_ENCODING}" ]]; then export ZEPPELIN_ENCODING="UTF-8" fi -if [[ -z "$ZEPPELIN_MEM" ]]; then +if [[ -z "${ZEPPELIN_MEM}" ]]; then export ZEPPELIN_MEM="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m" fi +if [[ -z "${ZEPPELIN_INTP_MEM}" ]]; then + export ZEPPELIN_INTP_MEM="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m" +fi + JAVA_OPTS+=" ${ZEPPELIN_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING} ${ZEPPELIN_MEM}" JAVA_OPTS+=" -Dlog4j.configuration=file://${ZEPPELIN_CONF_DIR}/log4j.properties" export JAVA_OPTS http://git-wip-us.apache.org/repos/asf/zeppelin/blob/abd95fa5/conf/zeppelin-env.cmd.template -- diff --git a/conf/zeppelin-env.cmd.template b/conf/zeppelin-env.cmd.template index 4d697fc..cb7f87c 100644 --- a/conf/zeppelin-env.cmd.template +++ b/conf/zeppelin-env.cmd.template @@ -19,8 +19,8 @@ REM REM set JAVA_HOME= REM set MASTER=REM Spark master url. eg. spark://master_addr:7077. Leave empty if you want to use local mode. REM set ZEPPELIN_JAVA_OPTS REM Additional jvm options. for example, set ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g -Dspark.cores.max=16" -REM set ZEPPELIN_MEM REM Zeppelin jvm mem options Default -Xmx1024m -XX:MaxPermSize=512m -REM set ZEPPELIN_INTP_MEM REM zeppelin interpreter process jvm mem options. +REM set ZEPPELIN_MEM REM Zeppelin jvm mem options Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m +REM set ZEPPELIN_INTP_MEM REM zeppelin interpreter process jvm mem options. Default -Xmx1024m -Xms1024m -XX:MaxPermSize=512m REM set ZEPPELIN_INTP_JAVA_OPTSREM zeppelin interpreter process jvm options. REM set ZEPPELIN_LOG_DIR REM Where log files are stored. PWD by default. http://git-wip-us.apache.org/repos/asf/zeppelin/blob/abd95fa5/conf/zeppelin-env.sh.template