Author: moon Date: Wed Dec 14 00:05:19 2016 New Revision: 1774116 URL: http://svn.apache.org/viewvc?rev=1774116&view=rev Log: fix image path https://github.com/apache/zeppelin/pull/1752
Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml zeppelin/site/docs/0.7.0-SNAPSHOT/development/howtocontribute.html zeppelin/site/docs/0.7.0-SNAPSHOT/displaysystem/basicdisplaysystem.html zeppelin/site/docs/0.7.0-SNAPSHOT/install/upgrade.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/spark.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/userimpersonation.html zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-notebook.html zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml zeppelin/site/docs/0.7.0-SNAPSHOT/search_data.json Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml?rev=1774116&r1=1774115&r2=1774116&view=diff ============================================================================== --- zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml Wed Dec 14 00:05:19 2016 @@ -4,7 +4,7 @@ <title>Apache Zeppelin</title> <link href="http://zeppelin.apache.org/" rel="self"/> <link href="http://zeppelin.apache.org"/> - <updated>2016-11-29T14:18:58-08:00</updated> + <updated>2016-12-13T16:04:16-08:00</updated> <id>http://zeppelin.apache.org</id> <author> <name>The Apache Software Foundation</name> Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/development/howtocontribute.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/development/howtocontribute.html?rev=1774116&r1=1774115&r2=1774116&view=diff ============================================================================== --- zeppelin/site/docs/0.7.0-SNAPSHOT/development/howtocontribute.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/development/howtocontribute.html Wed Dec 14 00:05:19 2016 @@ -277,8 +277,9 @@ HADOOP_HOME=YOUR_HADOOP_HOME JAVA_HOME=Y <p>Some portions of the Zeppelin code are generated by <a href="http://thrift.apache.org">Thrift</a>. For most Zeppelin changes, you don't need to worry about this. But if you modify any of the Thrift IDL files (e.g. zeppelin-interpreter/src/main/thrift/*.thrift), then you also need to regenerate these files and submit their updated version as part of your patch.</p> -<p>To regenerate the code, install <strong>thrift-0.9.2</strong> and change directory into Zeppelin source directory. and then run following command</p> -<div class="highlight"><pre><code class="text language-text" data-lang="text">thrift -out zeppelin-interpreter/src/main/java/ --gen java zeppelin-interpreter/src/main/thrift/RemoteInterpreterService.thrift +<p>To regenerate the code, install <strong>thrift-0.9.2</strong> and then run the following command to generate thrift code.</p> +<div class="highlight"><pre><code class="text language-text" data-lang="text">cd <zeppelin_home>/zeppelin-interpreter/src/main/thrift +./genthrift.sh </code></pre></div> <h2>Where to Start</h2> Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/displaysystem/basicdisplaysystem.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/displaysystem/basicdisplaysystem.html?rev=1774116&r1=1774115&r2=1774116&view=diff ============================================================================== --- zeppelin/site/docs/0.7.0-SNAPSHOT/displaysystem/basicdisplaysystem.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/displaysystem/basicdisplaysystem.html Wed Dec 14 00:05:19 2016 @@ -212,38 +212,38 @@ limitations under the License. <p>By default, Apache Zeppelin prints interpreter response as a plain text using <code>text</code> display system.</p> -<p><img src="/assets/themes/zeppelin/img/screenshots/display_text.png" /></p> +<p><img src="../assets/themes/zeppelin/img/screenshots/display_text.png" /></p> <p>You can explicitly say you're using <code>text</code> display system.</p> -<p><img src="/assets/themes/zeppelin/img/screenshots/display_text1.png" /></p> +<p><img src="../assets/themes/zeppelin/img/screenshots/display_text1.png" /></p> <h2>Html</h2> <p>With <code>%html</code> directive, Zeppelin treats your output as HTML</p> -<p><img src="/assets/themes/zeppelin/img/screenshots/display_html.png" /></p> +<p><img src="../assets/themes/zeppelin/img/screenshots/display_html.png" /></p> <h3>Mathematical expressions</h3> <p>HTML display system automatically formats mathematical expression using <a href="https://www.mathjax.org/">MathJax</a>. You can use <code>\\( INLINE EXPRESSION \\)</code> and <code>$$ EXPRESSION $$</code> to format. For example</p> -<p><img src="/assets/themes/zeppelin/img/screenshots/display_formula.png" /></p> +<p><img src="../assets/themes/zeppelin/img/screenshots/display_formula.png" /></p> <h2>Table</h2> -<p>If you have data that row separated by '\n' (newline) and column separated by '\t' (tab) with first row as header row, for example</p> +<p>If you have data that row separated by <code>\n</code> (newline) and column separated by <code>\t</code> (tab) with first row as header row, for example</p> -<p><img src="/assets/themes/zeppelin/img/screenshots/display_table.png" /></p> +<p><img src="../assets/themes/zeppelin/img/screenshots/display_table.png" /></p> <p>You can simply use <code>%table</code> display system to leverage Zeppelin's built in visualization.</p> -<p><img src="/assets/themes/zeppelin/img/screenshots/display_table1.png" /></p> +<p><img src="../assets/themes/zeppelin/img/screenshots/display_table1.png" /></p> <p>If table contents start with <code>%html</code>, it is interpreted as an HTML.</p> -<p><img src="/assets/themes/zeppelin/img/screenshots/display_table_html.png" /></p> +<p><img src="../assets/themes/zeppelin/img/screenshots/display_table_html.png" /></p> <blockquote> <p><strong>Note :</strong> Display system is backend independent.</p> Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/install/upgrade.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/install/upgrade.html?rev=1774116&r1=1774115&r2=1774116&view=diff ============================================================================== --- zeppelin/site/docs/0.7.0-SNAPSHOT/install/upgrade.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/install/upgrade.html Wed Dec 14 00:05:19 2016 @@ -235,6 +235,7 @@ So, copying <code>notebook</code> and <c <li>Usage of <code>ZEPPELIN_PORT</code> is not supported in ssl mode. Instead use <code>ZEPPELIN_SSL_PORT</code> to configure the ssl port. Value from <code>ZEPPELIN_PORT</code> is used only when <code>ZEPPELIN_SSL</code> is set to <code>false</code>.</li> <li>The support on Spark 1.1.x to 1.3.x is deprecated.</li> <li>From 0.7, we uses <code>pegdown</code> as the <code>markdown.parser.type</code> option for the <code>%md</code> interpreter. Rendered markdown might be different from what you expected</li> +<li>From 0.7 note.json format has been changed to support multiple outputs in a paragraph. Zeppelin will automatically convert old format to new format. 0.6 or lower version can read new note.json format but output will not be displayed. For the detail, see <a href="http://issues.apache.org/jira/browse/ZEPPELIN-212">ZEPPELIN-212</a> and <a href="https://github.com/apache/zeppelin/pull/1658">pullrequest</a>.</li> </ul> </div> Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/spark.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/spark.html?rev=1774116&r1=1774115&r2=1774116&view=diff ============================================================================== --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/spark.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/spark.html Wed Dec 14 00:05:19 2016 @@ -331,9 +331,15 @@ You can also set other Spark properties <p>For example,</p> <div class="highlight"><pre><code class="bash language-bash" data-lang="bash"><span class="nb">export </span><span class="nv">SPARK_HOME</span><span class="o">=</span>/usr/lib/spark </code></pre></div> -<p>You can optionally export <code>HADOOP_CONF_DIR</code> and <code>SPARK_SUBMIT_OPTIONS</code></p> -<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 +<p>You can optionally set more environment variables</p> +<div class="highlight"><pre><code class="bash language-bash" data-lang="bash"><span class="c"># set hadoop conf dir</span> +<span class="nb">export </span><span class="nv">HADOOP_CONF_DIR</span><span class="o">=</span>/usr/lib/hadoop + +<span class="c"># set options to pass spark-submit command</span> <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> + +<span class="c"># extra classpath. e.g. set classpath for hive-site.xml</span> +<span class="nb">export </span><span class="nv">ZEPPELIN_INTP_CLASSPATH_OVERRIDES</span><span class="o">=</span>/etc/hive/conf </code></pre></div> <p>For Windows, ensure you have <code>winutils.exe</code> in <code>%HADOOP_HOME%\bin</code>. Please see <a href="https://wiki.apache.org/hadoop/WindowsProblems">Problems running Hadoop on Windows</a> for the details.</p> @@ -485,6 +491,12 @@ So you can put some objects from Scala a <span class="o">%</span><span class="n">spark</span> <span class="k">val</span> <span class="n">myObject</span> <span class="k">=</span> <span class="o">...</span> <span class="n">z</span><span class="o">.</span><span class="n">put</span><span class="o">(</span><span class="s">"objName"</span><span class="o">,</span> <span class="n">myObject</span><span class="o">)</span> + +<span class="c1">// Exchanging data frames</span> +<span class="n">myScalaDataFrame</span> <span class="k">=</span> <span class="o">...</span> +<span class="n">z</span><span class="o">.</span><span class="n">put</span><span class="o">(</span><span class="s">"myScalaDataFrame"</span><span class="o">,</span> <span class="n">myScalaDataFrame</span><span class="o">)</span> + +<span class="k">val</span> <span class="n">myPythonDataFrame</span> <span class="k">=</span> <span class="n">z</span><span class="o">.</span><span class="n">get</span><span class="o">(</span><span class="s">"myPythonDataFrame"</span><span class="o">).</span><span class="n">asInstanceOf</span><span class="o">[</span><span class="kt">DataFrame</span><span class="o">]</span> </code></pre></div> @@ -495,6 +507,12 @@ So you can put some objects from Scala a <div class="highlight"><pre><code class="python"><span class="c"># Get object from python</span> <span class="o">%</span><span class="n">spark</span><span class="o">.</span><span class="n">pyspark</span> <span class="n">myObject</span> <span class="o">=</span> <span class="n">z</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s">"objName"</span><span class="p">)</span> + +<span class="c"># Exchanging data frames</span> +<span class="n">myPythonDataFrame</span> <span class="o">=</span> <span class="o">...</span> +<span class="n">z</span><span class="o">.</span><span class="n">put</span><span class="p">(</span><span class="s">"myPythonDataFrame"</span><span class="p">,</span> <span class="n">postsDf</span><span class="o">.</span><span class="n">_jdf</span><span class="p">)</span> + +<span class="n">myScalaDataFrame</span> <span class="o">=</span> <span class="n">DataFrame</span><span class="p">(</span><span class="n">z</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s">"myScalaDataFrame"</span><span class="p">),</span> <span class="n">sqlContext</span><span class="p">)</span> </code></pre></div> Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/manual/userimpersonation.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/manual/userimpersonation.html?rev=1774116&r1=1774115&r2=1774116&view=diff ============================================================================== --- zeppelin/site/docs/0.7.0-SNAPSHOT/manual/userimpersonation.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/manual/userimpersonation.html Wed Dec 14 00:05:19 2016 @@ -222,6 +222,11 @@ ssh user1@localhost mkdir -p .ssh cat ~/.ssh/id_rsa.pub | ssh user1@localhost 'cat >> .ssh/authorized_keys' </code></pre></div> <ul> +<li>Alternatively instead of password-less, user can override ZEPPELIN<em>IMPERSONATE</em>CMD in zeppelin-env.sh</li> +</ul> +<div class="highlight"><pre><code class="text language-text" data-lang="text">export ZEPPELIN_IMPERSONATE_CMD='sudo -H -u ${ZEPPELIN_IMPERSONATE_USER} bash -c ' +</code></pre></div> +<ul> <li>Start zeppelin server.</li> </ul> Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-notebook.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-notebook.html?rev=1774116&r1=1774115&r2=1774116&view=diff ============================================================================== --- zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-notebook.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-notebook.html Wed Dec 14 00:05:19 2016 @@ -393,10 +393,14 @@ Note that Apache Zeppelin REST APIs rece }, "jobName": "paragraph_1423500782552_-1439281894", "id": "20150210-015302_1492795503", - "result": { + "results": { "code": "SUCCESS", - "type": "TABLE", - "msg": "age\tvalue\n19\t4\n20\t3\n21\t7\n22\t9\n23\t20\n24\t24\n25\t44\n26\t77\n27\t94\n28\t103\n29\t97\n" + "msg": [ + { + "type": "TABLE", + "data": "age\tvalue\n19\t4\n20\t3\n21\t7\n22\t9\n23\t20\n24\t24\n25\t44\n26\t77\n27\t94\n28\t103\n29\t97\n" + } + ] }, "dateCreated": "Feb 10, 2015 1:53:02 AM", "dateStarted": "Jul 3, 2015 1:43:17 PM", @@ -1011,10 +1015,14 @@ Note that Apache Zeppelin REST APIs rece }, "jobName": "paragraph_1450391574392_-1890856722", "id": "20151218-073254_1105602047", - "result": { + "results": { "code": "SUCCESS", - "type": "TEXT", - "msg": "it's paragraph2\n" + "msg": [ + { + "type": "TEXT", + "data": "it's paragraph2\n" + } + ] }, "dateCreated": "Dec 18, 2015 7:32:54 AM", "dateStarted": "Dec 18, 2015 7:33:55 AM", @@ -1134,10 +1142,14 @@ Note that Apache Zeppelin REST APIs rece "apps":[], "jobName":"paragraph<em>1423500782552</em>-1439281894", "id":"20150210-015302_1492795503", - "result":{ + "results":{ "code":"SUCCESS", - "type":"TABLE", - "msg":"age\tvalue\n19\t4\n20\t3\n21\t7\n22\t9\n23\t20\n24\t24\n25\t44\n26\t77\n27\t94\n28\t103\n29\t97\n" + "msg": [ + { + "type":"TABLE", + "data":"age\tvalue\n19\t4\n20\t3\n21\t7\n22\t9\n23\t20\n24\t24\n25\t44\n26\t77\n27\t94\n28\t103\n29\t97\n" + } + ] }, "dateCreated":"Feb 10, 2015 1:53:02 AM", "dateStarted":"Jul 3, 2015 1:43:17 PM", Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml?rev=1774116&r1=1774115&r2=1774116&view=diff ============================================================================== --- zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml Wed Dec 14 00:05:19 2016 @@ -5,8 +5,8 @@ <description>Apache Zeppelin - The Apache Software Foundation</description> <link>http://zeppelin.apache.org</link> <link>http://zeppelin.apache.org</link> - <lastBuildDate>2016-11-29T14:18:58-08:00</lastBuildDate> - <pubDate>2016-11-29T14:18:58-08:00</pubDate> + <lastBuildDate>2016-12-13T16:04:16-08:00</lastBuildDate> + <pubDate>2016-12-13T16:04:16-08:00</pubDate> <ttl>1800</ttl>