Skip to content

Commit 53c1eea

Browse files
SachinJananiSachinJanani
committed
Merge pull request #1 from apache/master
Latest update
2 parents 7c50cac + bdc78da commit 53c1eea

File tree

64 files changed

+820
-204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+820
-204
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ conf/truststore
2626
conf/interpreter.json
2727
conf/notebook-authorization.json
2828
conf/shiro.ini
29+
conf/credentials.json
2930

3031
# other generated files
3132
spark/dependency-reduced-pom.xml

‎alluxio/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
<parent>
2323
<artifactId>zeppelin</artifactId>
2424
<groupId>org.apache.zeppelin</groupId>
25-
<version>0.6.0-incubating-SNAPSHOT</version>
25+
<version>0.6.0-SNAPSHOT</version>
2626
<relativePath>..</relativePath>
2727
</parent>
2828

2929
<groupId>org.apache.zeppelin</groupId>
3030
<artifactId>zeppelin-alluxio</artifactId>
3131
<packaging>jar</packaging>
32-
<version>0.6.0-incubating-SNAPSHOT</version>
32+
<version>0.6.0-SNAPSHOT</version>
3333
<name>Zeppelin: Alluxio interpreter</name>
3434
<url>http://www.apache.org</url>
3535

‎angular/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
<parent>
2323
<artifactId>zeppelin</artifactId>
2424
<groupId>org.apache.zeppelin</groupId>
25-
<version>0.6.0-incubating-SNAPSHOT</version>
25+
<version>0.6.0-SNAPSHOT</version>
2626
<relativePath>..</relativePath>
2727
</parent>
2828

2929
<groupId>org.apache.zeppelin</groupId>
3030
<artifactId>zeppelin-angular</artifactId>
3131
<packaging>jar</packaging>
32-
<version>0.6.0-incubating-SNAPSHOT</version>
32+
<version>0.6.0-SNAPSHOT</version>
3333
<name>Zeppelin: Angular interpreter</name>
3434
<url>http://zeppelin.apache.org</url>
3535

‎cassandra/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
<parent>
2323
<artifactId>zeppelin</artifactId>
2424
<groupId>org.apache.zeppelin</groupId>
25-
<version>0.6.0-incubating-SNAPSHOT</version>
25+
<version>0.6.0-SNAPSHOT</version>
2626
<relativePath>..</relativePath>
2727
</parent>
2828

2929
<groupId>org.apache.zeppelin</groupId>
3030
<artifactId>zeppelin-cassandra</artifactId>
3131
<packaging>jar</packaging>
32-
<version>0.6.0-incubating-SNAPSHOT</version>
32+
<version>0.6.0-SNAPSHOT</version>
3333
<name>Zeppelin: Cassandra</name>
3434
<description>Zeppelin cassandra support</description>
3535
<url>http://zeppelin.apache.org</url>

‎docs/_config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ encoding: utf-8
1212
# Themes are encouraged to use these universal variables
1313
# so be sure to set them if your theme uses them.
1414
#
15-
title : Apache Zeppelin (incubating)
15+
title : Apache Zeppelin
1616
tagline: Simplify bigdata analytics
1717
author :
1818
name : The Apache Software Foundation
@@ -21,7 +21,7 @@ author :
2121
twitter : ASF
2222
feedburner : feedname
2323

24-
ZEPPELIN_VERSION : 0.6.0-incubating-SNAPSHOT
24+
ZEPPELIN_VERSION : 0.6.0-SNAPSHOT
2525

2626
# The production_url is only used when full-domain names are needed
2727
# such as sitemap.txt
@@ -59,7 +59,7 @@ JB :
5959
# - Only the following values are falsy: ["", null, false]
6060
# - When setting BASE_PATH it must be a valid url.
6161
# This means always setting the protocol (http|https) or prefixing with "/"
62-
BASE_PATH : /docs/0.6.0-incubating-SNAPSHOT
62+
BASE_PATH : /docs/0.6.0-SNAPSHOT
6363

6464
# By default, the asset_path is automatically defined relative to BASE_PATH plus the enabled theme.
6565
# ex: [BASE_PATH]/assets/themes/[THEME-NAME]

‎docs/_includes/themes/zeppelin/_navigation.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<a class="navbar-brand" href="{{BASE_PATH}}">
1111
<img src="/assets/themes/zeppelin/img/zeppelin_logo.png" width="50" alt="I'm zeppelin">
1212
<span style="vertical-align:middle">Zeppelin</span>
13-
<span style="vertical-align:baseline"><small>(0.6.0-incubating-SNAPSHOT)</small></span>
13+
<span style="vertical-align:baseline"><small>(0.6.0-SNAPSHOT)</small></span>
1414
</a>
1515
</div>
1616
<nav class="navbar-collapse collapse" role="navigation">

‎docs/development/howtocontribute.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ group: development
88
# Contributing to Apache Zeppelin ( Code )
99

1010
## IMPORTANT
11-
Apache Zeppelin (incubating) is an [Apache2 License](http://www.apache.org/licenses/LICENSE-2.0.html) Software.
11+
Apache Zeppelin is an [Apache2 License](http://www.apache.org/licenses/LICENSE-2.0.html) Software.
1212
Any contributions to Zeppelin (Source code, Documents, Image, Website) means you agree with license all your contributions as Apache2 License.
1313

1414
## Setting up
@@ -100,9 +100,9 @@ thrift -out zeppelin-interpreter/src/main/java/ --gen java zeppelin-interpreter/
100100
Zeppelin manages its issues in Jira. [https://issues.apache.org/jira/browse/ZEPPELIN](https://issues.apache.org/jira/browse/ZEPPELIN)
101101

102102
## Where to Start
103-
You can find issues for [beginner](https://issues.apache.org/jira/browse/ZEPPELIN-924?jql=project%20%3D%20ZEPPELIN%20and%20status%20%3D%20Open%20and%20labels%20in%20\(beginner%2C%20newbie\))
103+
You can find issues for [beginner](https://issues.apache.org/jira/browse/ZEPPELIN-924?jql=project%20%3D%20ZEPPELIN%20and%20status%20%3D%20Open%20and%20labels%20in%20\(beginner%2C%20newbie\)).
104104

105105
## Stay involved
106106
Contributors should join the Zeppelin mailing lists.
107107

108-
* [[email protected]](http://mail-archives.apache.org/mod_mbox/incubator-zeppelin-dev/) is for people who want to contribute code to Zeppelin. [subscribe](mailto:[email protected]?subject=send this email to subscribe), [unsubscribe](mailto:[email protected]?subject=send this email to unsubscribe), [archives](http://mail-archives.apache.org/mod_mbox/incubator-zeppelin-dev/)
108+
* [[email protected]](http://mail-archives.apache.org/mod_mbox/zeppelin-dev/) is for people who want to contribute code to Zeppelin. [subscribe](mailto:[email protected]?subject=send this email to subscribe), [unsubscribe](mailto:[email protected]?subject=send this email to unsubscribe), [archives](http://mail-archives.apache.org/mod_mbox/zeppelin-dev/)

‎docs/doap.rdf‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎docs/index.md‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,7 @@ If you want to learn more about this feature, please visit [this page](./manual/
116116
<br />
117117
### 100% Opensource
118118

119-
Apache Zeppelin (incubating) is Apache2 Licensed software. Please check out the [source repository](http://git.apache.org/incubator-zeppelin.git) and [How to contribute](./development/howtocontribute.html)
119+
Apache Zeppelin is Apache2 Licensed software. Please check out the [source repository](http://git.apache.org/incubator-zeppelin.git) and [How to contribute](./development/howtocontribute.html)
120120

121121
Zeppelin has a very active development community.
122-
Join the [Mailing list](./community.html) and report issues on our [Issue tracker](https://issues.apache.org/jira/browse/ZEPPELIN).
123-
124-
<br />
125-
### Undergoing Incubation
126-
Apache Zeppelin is an effort undergoing [incubation](https://incubator.apache.org/index.html) at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
122+
Join the [Mailing list](https://zeppelin.apache.org/community.html) and report issues on our [Issue tracker](https://issues.apache.org/jira/browse/ZEPPELIN).

‎docs/interpreter/r.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ group: manual
88

99
## R Interpreter
1010

11-
This is a the Apache (incubating) Zeppelin project, with the addition of support for the R programming language and R-spark integration.
11+
This is a the Apache Zeppelin project, with the addition of support for the R programming language and R-spark integration.
1212

1313
### Requirements
1414

0 commit comments

Comments
 (0)