Author: moon
Date: Fri Mar 25 14:52:05 2016
New Revision: 1736583
URL: http://svn.apache.org/viewvc?rev=1736583&view=rev
Log:
https://issues.apache.org/jira/browse/ZEPPELIN-692
Modified:
incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/atom.xml
incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/install/install.html
incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/spark.html
incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/atom.xml
URL:
http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/atom.xml?rev=1736583&r1=1736582&r2=1736583&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/atom.xml (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/atom.xml Fri Mar 25
14:52:05 2016
@@ -4,7 +4,7 @@
<title>Apache Zeppelin (incubating)</title>
<link href="http://zeppelin.incubator.apache.org/"; rel="self"/>
<link href="http://zeppelin.incubator.apache.org"/>
- <updated>2016-03-23T07:17:25-07:00</updated>
+ <updated>2016-03-25T07:51:29-07:00</updated>
<id>http://zeppelin.incubator.apache.org</id>
<author>
<name>The Apache Software Foundation</name>
Modified:
incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/install/install.html
URL:
http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/install/install.html?rev=1736583&r1=1736582&r2=1736583&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/install/install.html
(original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/install/install.html
Fri Mar 25 14:52:05 2016
@@ -202,7 +202,7 @@ limitations under the License.
<h2>Zeppelin Configuration</h2>
-<p>You can configure Zeppelin with both <strong>environment variables</strong>
in <code>conf/zeppelin-env.sh</code> and <strong>java properties</strong> in
<code>conf/zeppelin-site.xml</code>. If both are defined, then the
<strong>environment variables</strong> will be used priorly.</p>
+<p>You can configure Zeppelin with both <strong>environment variables</strong>
in <code>conf/zeppelin-env.sh</code> (<code>conf\zeppelin-env.cmd</code> for
Windows) and <strong>Java properties</strong> in
<code>conf/zeppelin-site.xml</code>. If both are defined, then the
<strong>environment variables</strong> will take priority.</p>
<table class="table-configuration">
<tr>
@@ -344,6 +344,12 @@ limitations under the License.
<td>A user name of S3 bucket<br />i.e.
<code>bucket/user/notebook/2A94M5J1Z/note.json</code></td>
</tr>
<tr>
+ <td>ZEPPELIN_NOTEBOOK_S3_ENDPOINT</td>
+ <td>zeppelin.notebook.s3.endpoint</td>
+ <td>s3.amazonaws.com</td>
+ <td>Endpoint for the bucket</td>
+ </tr>
+ <tr>
<td>ZEPPELIN_NOTEBOOK_AZURE_CONNECTION_STRING</td>
<td>zeppelin.notebook.azure.connectionString</td>
<td></td>
@@ -385,7 +391,7 @@ limitations under the License.
</table>
<p>Maybe you need to configure individual interpreter. If so, please check
<strong>Interpreter</strong> section in Zeppelin documentation.
-<a href="../interpreter/spark.html">Spark Interpreter for Apache Zeppelin</a>
will be a good example. </p>
+<a href="../interpreter/spark.html">Spark Interpreter for Apache Zeppelin</a>
will be a good example.</p>
<h2>Zeppelin Start / Stop</h2>
@@ -401,9 +407,9 @@ limitations under the License.
<p>Zeppelin can auto start as a service with an init script, such as services
managed by upstart.</p>
-<p>The following is an example upstart script to be saved as
<code>/etc/init/zeppelin.conf</code>
+<p>The following is an example upstart script to be saved as
<code>/etc/init/zeppelin.conf</code>
This example has been tested with Ubuntu Linux.
-This also allows the service to be managed with commands such as </p>
+This also allows the service to be managed with commands such as</p>
<p><code>sudo service zeppelin start</code><br>
<code>sudo service zeppelin stop</code><br>
@@ -428,6 +434,9 @@ respawn limit 7 5
chdir /usr/share/zeppelin
exec bin/zeppelin-daemon.sh upstart
</code></pre></div>
+<h4>Running on Windows</h4>
+<div class="highlight"><pre><code class="text language-text"
data-lang="text">bin\zeppelin.cmd
+</code></pre></div>
</div>
</div>
Modified:
incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/spark.html
URL:
http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/spark.html?rev=1736583&r1=1736582&r2=1736583&view=diff
==============================================================================
---
incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/spark.html
(original)
+++
incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/spark.html
Fri Mar 25 14:52:05 2016
@@ -275,6 +275,8 @@ You can also set other Spark properties
<div class="highlight"><pre><code class="bash language-bash"
data-lang="bash"><span class="nb">export </span><span
class="nv">HADOOP_CONF_DIR</span><span class="o">=</span>/usr/lib/hadoop
<span class="nb">export </span><span
class="nv">SPARK_SUBMIT_OPTIONS</span><span class="o">=</span><span
class="s2">"--packages com.databricks:spark-csv_2.10:1.2.0"</span>
</code></pre></div>
+<p>For Windows, ensure you have <code>winutils.exe</code> in
<code>%HADOOP_HOME%\bin</code>. For more details please see <a
href="https://wiki.apache.org/hadoop/WindowsProblems";>Problems running Hadoop
on Windows</a></p>
+
<h3>2. Set master in Interpreter menu</h3>
<p>After start Zeppelin, go to <strong>Interpreter</strong> menu and edit
<strong>master</strong> property in your Spark interpreter setting. The value
may vary depending on your Spark cluster deployment type.</p>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml
URL:
http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml?rev=1736583&r1=1736582&r2=1736583&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml Fri Mar 25
14:52:05 2016
@@ -5,8 +5,8 @@
<description>Apache Zeppelin (incubating) - The Apache Software
Foundation</description>
<link>http://zeppelin.incubator.apache.org</link>
<link>http://zeppelin.incubator.apache.org</link>
- <lastBuildDate>2016-03-23T07:17:25-07:00</lastBuildDate>
- <pubDate>2016-03-23T07:17:25-07:00</pubDate>
+ <lastBuildDate>2016-03-25T07:51:29-07:00</lastBuildDate>
+ <pubDate>2016-03-25T07:51:29-07:00</pubDate>
<ttl>1800</ttl>
