You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@zeppelin.apache.org by almacro <gi...@git.apache.org> on 2015/08/12 21:09:26 UTC
[GitHub] incubator-zeppelin pull request: Merge sandbox 20150812a
GitHub user almacro opened a pull request:
https://github.com/apache/incubator-zeppelin/pull/204
Merge sandbox 20150812a
This merge is to catch us up with Apache's incubator project.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/omegapointresearch/incubator-zeppelin merge-sandbox-20150812a
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-zeppelin/pull/204.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 #204
----
commit 3957db714c79d6db2c7270be69349fb58ea74b35
Author: Al Thompson <al...@gmail.com>
Date: 2015-05-18T01:21:19Z
Merge pull request #1 from apache/master
Catch up incubator-zeppelin with progress on Apache Incubator
commit 47ca33eb5b3817753c4a6d2cd9423a15ec2f87d0
Author: Jeff Bowles <je...@gmail.com>
Date: 2015-08-04T15:54:02Z
Merge remote-tracking branch 'apache/master' into dev-merging-spark141-updates
commit 3fc5bb0c87b1c4ea14d26b4c849245968618e083
Author: Al Thompson <al...@acm.org>
Date: 2015-08-06T07:04:36Z
Merge remote-tracking branch 'upstream/master'
This revision merges latest zeppelin changes including support for Apache Spark 1.4.1.
commit 9487ed8088e1f762ccbb18d316901cc78916c76c
Author: Al Thompson <al...@acm.org>
Date: 2015-08-12T18:45:03Z
This revision adds files newly added into Apache's incubator since last merge.
commit 1d0932dcf4c363e7066b14a6dab722398702bc61
Author: Al Thompson <al...@acm.org>
Date: 2015-08-12T18:46:57Z
This revision syncs OPR's incubator-zeppelin fork to catch up to latest Apache incubator-zeppelin.
commit 1ef3188105f3ef342b215f26903973534cf0d08e
Author: Al Thompson <al...@acm.org>
Date: 2015-08-12T18:47:50Z
The credentials file was removed from Apache's incubator so this revision removes it from ours.
----
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-zeppelin pull request: Merge sandbox 20150812a
Posted by almacro <gi...@git.apache.org>.
Github user almacro closed the pull request at:
https://github.com/apache/incubator-zeppelin/pull/204
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-zeppelin pull request: Merge sandbox 20150812a
Posted by almacro <gi...@git.apache.org>.
Github user almacro commented on the pull request:
https://github.com/apache/incubator-zeppelin/pull/204#issuecomment-130422636
This is merging in the wrong direction.
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---