Thanks @bzz. I'm a little bit confused about where we are now - will one or both interpreters work for people who download this now?
> On Apr 6, 2016, at 5:39 AM, b...@apache.org wrote: > > Repository: incubator-zeppelin > Updated Branches: > refs/heads/master fb8e77bfd -> 9cc7e4f40 > > > Re-apply #815 - resolve SparkR implementation conflict > > ### What is this PR for? > Somehow final squashed merge commit for #815 - > fb8e77bfd7296a08106b44fd834e4cf0d6950a70 does not include 2 changes out of 3 > changes: > - eeb411e > - 9baf57b > > This PR re-applies Leemoonsoo work on master and should fix the CI > > ### 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: Alexander Bezzubov <b...@apache.org> > > Closes #820 from bzz/re-apply-SparkR-implementation-conflict-815 and squashes > the following commits: > > 60267b4 [Alexander Bezzubov] Change interpreter listing order, re-apply > eeb411e > 7ec1e2c [Alexander Bezzubov] Change node and npm version, re-apply 9baf57b > > > Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo > Commit: > http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/9cc7e4f4 > Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/9cc7e4f4 > Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/9cc7e4f4 > > Branch: refs/heads/master > Commit: 9cc7e4f40fc80ab4aa407617329c55752993b8fb > Parents: fb8e77b > Author: Alexander Bezzubov <b...@apache.org> > Authored: Wed Apr 6 17:32:35 2016 +0900 > Committer: Alexander Bezzubov <b...@apache.org> > Committed: Wed Apr 6 18:38:47 2016 +0900 > > ---------------------------------------------------------------------- > conf/zeppelin-site.xml.template | 4 ++-- > zeppelin-web/pom.xml | 4 ++-- > .../java/org/apache/zeppelin/conf/ZeppelinConfiguration.java | 6 +++--- > 3 files changed, 7 insertions(+), 7 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/9cc7e4f4/conf/zeppelin-site.xml.template > ---------------------------------------------------------------------- > diff --git a/conf/zeppelin-site.xml.template b/conf/zeppelin-site.xml.template > index 3fb55c2..3c51438 100755 > --- a/conf/zeppelin-site.xml.template > +++ b/conf/zeppelin-site.xml.template > @@ -144,8 +144,8 @@ > > <property> > <name>zeppelin.interpreters</name> > - > <value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.spark.SparkRInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.angular.AngularInterpreter,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter,org.apache.zeppelin.tajo.TajoInterpreter,org.apache.zeppelin.file.HDFSFileInterpreter,org.apache.zeppelin.flink.FlinkInterpreter,org.apache.zeppelin.lens.LensInterpreter,org.apache.zeppelin.ignite.IgniteInterpreter,org.apache.zeppelin.ignite.IgniteSqlInterpreter,org.apache.zeppelin.cassandra.CassandraInterpreter,org.apache.zeppelin.geode.GeodeOqlInterpreter,org.apache.zeppelin.postgresql.PostgreSqlInterpreter,org.apache.zeppelin.jdbc.JDBCInterpreter,org.apache.zeppelin.phoenix.PhoenixInterpreter,org.apache.zeppelin.kylin.KylinInterpreter,org.apache.zeppelin.elasticsearch.ElasticsearchInterpret > er,org.apache.zeppelin.scalding.ScaldingInterpreter,org.apache.zeppelin.alluxio.AlluxioInterpreter,org.apache.zeppelin.hbase.HbaseInterpreter,org.apache.zeppelin.rinterpreter.KnitR,org.apache.zeppelin.rinterpreter.RRepl</value> > - <description>Comma separated interpreter configurations. First interpreter > become a default</description> > + > <value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.rinterpreter.RRepl,org.apache.zeppelin.rinterpreter.KnitR,org.apache.zeppelin.spark.SparkRInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.angular.AngularInterpreter,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter,org.apache.zeppelin.tajo.TajoInterpreter,org.apache.zeppelin.file.HDFSFileInterpreter,org.apache.zeppelin.flink.FlinkInterpreter,org.apache.zeppelin.lens.LensInterpreter,org.apache.zeppelin.ignite.IgniteInterpreter,org.apache.zeppelin.ignite.IgniteSqlInterpreter,org.apache.zeppelin.cassandra.CassandraInterpreter,org.apache.zeppelin.geode.GeodeOqlInterpreter,org.apache.zeppelin.postgresql.PostgreSqlInterpreter,org.apache.zeppelin.jdbc.JDBCInterpreter,org.apache.zeppelin.phoenix.PhoenixInterpreter,org.apache.zeppelin.k > ylin.KylinInterpreter,org.apache.zeppelin.elasticsearch.ElasticsearchInterpreter,org.apache.zeppelin.scalding.ScaldingInterpreter,org.apache.zeppelin.alluxio.AlluxioInterpreter,org.apache.zeppelin.hbase.HbaseInterpreter</value> > +<description>Comma separated interpreter configurations. First interpreter > become a default</description> > </property> > > <property> > > http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/9cc7e4f4/zeppelin-web/pom.xml > ---------------------------------------------------------------------- > diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml > index 6fa62ae..2c46c76 100644 > --- a/zeppelin-web/pom.xml > +++ b/zeppelin-web/pom.xml > @@ -95,8 +95,8 @@ > <goal>install-node-and-npm</goal> > </goals> > <configuration> > - <nodeVersion>v0.10.22</nodeVersion> > - <npmVersion>1.3.8</npmVersion> > + <nodeVersion>v0.12.13</nodeVersion> > + <npmVersion>2.15.0</npmVersion> > </configuration> > </execution> > > > http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/9cc7e4f4/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java > ---------------------------------------------------------------------- > diff --git > a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java > > b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java > old mode 100755 > new mode 100644 > index eafbbbe..9e2ba5b > --- > a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java > +++ > b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java > @@ -451,6 +451,8 @@ public class ZeppelinConfiguration extends > XMLConfiguration { > ZEPPELIN_WAR_TEMPDIR("zeppelin.war.tempdir", "webapps"), > ZEPPELIN_INTERPRETERS("zeppelin.interpreters", > "org.apache.zeppelin.spark.SparkInterpreter," > + "org.apache.zeppelin.spark.PySparkInterpreter," > + + "org.apache.zeppelin.rinterpreter.RRepl," > + + "org.apache.zeppelin.rinterpreter.KnitR," > + "org.apache.zeppelin.spark.SparkRInterpreter," > + "org.apache.zeppelin.spark.SparkSqlInterpreter," > + "org.apache.zeppelin.spark.DepInterpreter," > @@ -473,9 +475,7 @@ public class ZeppelinConfiguration extends > XMLConfiguration { > + "org.apache.zeppelin.elasticsearch.ElasticsearchInterpreter," > + "org.apache.zeppelin.scalding.ScaldingInterpreter," > + "org.apache.zeppelin.jdbc.JDBCInterpreter," > - + "org.apache.zeppelin.hbase.HbaseInterpreter," > - + "org.apache.zeppelin.rinterpreter.RRepl," > - + "org.apache.zeppelin.rinterpreter.KnitR"), > + + "org.apache.zeppelin.hbase.HbaseInterpreter"), > ZEPPELIN_INTERPRETER_DIR("zeppelin.interpreter.dir", "interpreter"), > ZEPPELIN_INTERPRETER_LOCALREPO("zeppelin.interpreter.localRepo", > "local-repo"), > > ZEPPELIN_INTERPRETER_CONNECT_TIMEOUT("zeppelin.interpreter.connect.timeout", > 30000), >
