GitHub user tejasrivastav opened a pull request:

    https://github.com/apache/incubator-zeppelin/pull/712

    Apache branch 0.5.6

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/tejasrivastav/incubator-zeppelin 
apache-branch-0.5.6

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-zeppelin/pull/712.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #712
    
----
commit 72e38d0b3c3ba8b08ba1176c2eb2c38661a54d31
Author: Lee moon soo <moon@lees-macbook.local>
Date:   2015-11-03T02:03:49Z

    [maven-release-plugin] prepare release v0.5.5

commit 8575cb7bc6b3022f54073c1c7f29ac8f119b51dd
Author: Lee moon soo <moon@lees-macbook.local>
Date:   2015-11-03T02:04:08Z

    [maven-release-plugin] prepare for next development iteration

commit 49c7d35fad19defad8c3c205469a7d9dd8eabdfa
Author: Lee moon soo <m...@apache.org>
Date:   2015-11-06T04:16:51Z

    ZEPPELIN-396 Add -Pypspark profile for release binary
    
    https://issues.apache.org/jira/browse/ZEPPELIN-396
    Add -Ppyspark to enable pyspark in default configuration (without 
SPARK_HOME specified).
    
    Author: Lee moon soo <m...@apache.org>
    
    Closes #396 from Leemoonsoo/ZEPPELIN-396 and squashes the following commits:
    
    4e599af [Lee moon soo] Add -Pypspark profile for release binary
    
    (cherry picked from commit dfbc0e690c1dfdb6533207a98ef814ec79bff01e)
    Signed-off-by: Lee moon soo <m...@apache.org>

commit e5c1959a069c53d458df3ca47d5a4d3016796e6c
Author: Lee moon soo <m...@apache.org>
Date:   2015-11-06T04:57:13Z

    ZEPPELIN-397 Activate spark-1.5 and hadoop-2.4 by default in release script
    
    https://issues.apache.org/jira/browse/ZEPPELIN-397
    
    Activate spark-1.5 and hadoop-2.4 by default
    That'll enable use sc.textFile("s3...") with default configuration without 
specify SPARK_HOME.
    
    Author: Lee moon soo <m...@apache.org>
    
    This patch had conflicts when merged, resolved by
    Committer: Lee moon soo <m...@apache.org>
    
    Closes #397 from Leemoonsoo/ZEPPELIN-397 and squashes the following commits:
    
    9855dde [Lee moon soo] Activate spark-1.5 and hadoop-2.4 by default
    
    (cherry picked from commit a4db1688c9ce0a172722e289171e82099a43b55d)
    Signed-off-by: Lee moon soo <m...@apache.org>

commit 9a66283d7c1b4d180bcbbcf47d8e43d34bc29fde
Author: Lee moon soo <moon@lees-macbook.local>
Date:   2015-11-06T10:40:41Z

    [maven-release-plugin] prepare release v0.5.5

commit 1e9729fff442750ac96af7f42d30a83382b77df1
Author: Lee moon soo <m...@apache.org>
Date:   2015-11-06T11:09:54Z

    [maven-release-plugin] prepare for next development iteration

commit 0af2ea047428d4e4c5fa4a623f9d4963e5c17a28
Author: Lee moon soo <m...@apache.org>
Date:   2015-11-08T01:03:34Z

    ZEPPELIN-404 Certain project dependencies are pulled from 3rd parties repos 
instead of ASF or public Maven
    
    https://issues.apache.org/jira/browse/ZEPPELIN-404
    
    This PR removes / move 3rd party repository into profile.
    cloudera repo is disabled by default and can be activated by -Pvendor-repo
    
    Author: Lee moon soo <m...@apache.org>
    
    Closes #404 from Leemoonsoo/ZEPPELIN-404 and squashes the following commits:
    
    fe403a9 [Lee moon soo] Fix typo. vender-repo -> vendor-repo
    5b55ac0 [Lee moon soo] move cloudera repository into profile
    
    (cherry picked from commit 785ee3c8b46225da75698458acc5b730e8ead542)
    Signed-off-by: Lee moon soo <m...@apache.org>

commit 197e339d204f77a72a67f8f6033f103d95db338f
Author: Jeff Steinmetz <jeffrey.steinm...@gmail.com>
Date:   2015-11-08T05:24:53Z

    expanded build instructions to describe pyspark, and maven + node.js 
requirements
    
    Author: Jeff Steinmetz <jeffrey.steinm...@gmail.com>
    
    Closes #405 from jeffsteinmetz/branch-0.5.5 and squashes the following 
commits:
    
    d59230d [Jeff Steinmetz] use maven 3.3 link in setup example.  old links 
outdated
    68cb04b [Jeff Steinmetz] maven install via apt-get clobbers the openjdk-7 
install, and installs java6.  It also installs an older maven version.  Update 
ubuntu install example.
    e457745 [Jeff Steinmetz] expanded build instructions to include pyspark, 
and clarified maven and node.js requirements
    27e7930 [Jeff Steinmetz] expanded build instructions to include pyspark, 
and clarified maven and node.js requirements
    1015f86 [Jeff Steinmetz] expanded build instructions to include pyspark, 
and clarified maven and node.js requirements
    9617c01 [Jeff Steinmetz] expanded build instructions to include pyspark, 
and clarified maven and node.js requirements

commit 9f72df0f1e711746dfa90845abdeebf82df501db
Author: Lee moon soo <m...@apache.org>
Date:   2015-11-10T13:50:57Z

    ZEPPELIN-406 Handle license issue found in 0.5.5-incubating rc2
    
    This issue addresses license problem found in 0.5.5-incubating rc2
    https://issues.apache.org/jira/browse/ZEPPELIN-406
    
    * Removes unnecessary files
    
             docs/assets/bootstrap-3.0.2-dist.zip
             docs/assets/themes/twitter/
    
    * Add Apache license header if applicable
    * Add license info to LICENSE
    
             GLYPHICONS Halflings
             jekyll-bootstrap
             jekyll
    
    * Adjust rat plugin exclude rule
    
    Author: Lee moon soo <m...@apache.org>
    
    Closes #407 from Leemoonsoo/ZEPPELIN-406 and squashes the following commits:
    
    a216886 [Lee moon soo] Exclude license dir from rat check
    5ec2aca [Lee moon soo] Add binary license
    b7a749c [Lee moon soo] Change format of LICENSE and attach LICENSE file of 
individual dependency
    35e6554 [Lee moon soo] Update license according to dependency version
    84a75dc [Lee moon soo] put the json example on the doc page instead of 
separate files
    788a841 [Lee moon soo] Remove 3rd party dependences from LICENSE that are 
not included in source package
    0c0b68c [Lee moon soo] Add version info
    ab4ba01 [Lee moon soo] Add bootstrap and remove GLYPHICONS Halflings 
(distributed as a part of bootstrap with the same license) from LICENSE
    61dc5b7 [Lee moon soo] Exclude Gemfile.lock from rat plugin
    a48fbed [Lee moon soo] Add license header and update LICENSE, rat plugin
    c7a5f25 [Lee moon soo] Remove unused files
    3e031df [Lee moon soo] Enable rat plugin for docs directory

commit e4743e71d2421f5b6950f9e0f346f07bb84f1671
Author: Lee moon soo <m...@apache.org>
Date:   2015-11-11T11:31:26Z

    [maven-release-plugin] prepare release v0.5.5

commit e9e8a79190e95274a160bfdecbe66abab5281f49
Author: Teja <t...@datarpm.com>
Date:   2016-02-13T01:03:40Z

    Merge branch 'branch-0.5.6' of https://github.com/apache/incubator-zeppelin 
into apache-branch-0.5.6
    
    Conflicts:
        README.md
        angular/pom.xml
        cassandra/pom.xml
        dev/create_release.sh
        docs/community.md
        docs/docs/displaysystem/display.md
        docs/docs/displaysystem/table.md
        docs/docs/index.md
        docs/docs/install/install.md
        docs/docs/manual/dynamicform.md
        docs/docs/pleasecontribute.md
        docs/docs/releases/zeppelin-release-0.5.0-incubating.md
        docs/docs/rest-api/rest-interpreter.md
        docs/docs/rest-api/rest-notebook.md
        docs/download.md
        flink/pom.xml
        hive/pom.xml
        ignite/pom.xml
        kylin/pom.xml
        lens/pom.xml
        markdown/pom.xml
        phoenix/pom.xml
        pom.xml
        postgresql/pom.xml
        shell/pom.xml
        spark-dependencies/pom.xml
        spark/pom.xml
        tajo/pom.xml
        zeppelin-distribution/pom.xml
        zeppelin-distribution/src/bin_license/LICENSE
        zeppelin-interpreter/pom.xml
        zeppelin-server/pom.xml
        zeppelin-web/pom.xml
        zeppelin-zengine/pom.xml

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to