You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@edgent.apache.org by wmarshall484 <gi...@git.apache.org> on 2016/03/16 01:16:08 UTC
[GitHub] incubator-quarks-website pull request: Merged doc Jekyll repositor...
GitHub user wmarshall484 opened a pull request:
https://github.com/apache/incubator-quarks-website/pull/6
Merged doc Jekyll repository with main website.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/wmarshall484/incubator-quarks-website quarks-2-pr-3
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-quarks-website/pull/6.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 #6
----
commit 94de21131f4e79c345863656403ff77b3c37e652
Author: wcmarsha <wc...@us.ibm.com>
Date: 2016-03-15T23:42:27Z
Merged Jekyll repositories
commit fe04d717842118288faa047d74fb1af710930214
Author: wcmarsha <wc...@us.ibm.com>
Date: 2016-03-16T00:08:41Z
Changed mydocs url to docs. Fixed links.
----
---
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-quarks-website pull request: Merged doc Jekyll repositor...
Posted by wmarshall484 <gi...@git.apache.org>.
Github user wmarshall484 commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/6#issuecomment-197680696
Recreated to merge into master.
---
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-quarks-website pull request: Merged doc Jekyll repositor...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-quarks-website/pull/6
---
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-quarks-website pull request: Merged doc Jekyll repositor...
Posted by wmarshall484 <gi...@git.apache.org>.
Github user wmarshall484 commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/6#issuecomment-197672860
There was a name collision for:
_includes/head.html
_includes/footer.html
_layouts/default.html
I renamed the files from the main landing page to *_orig.html, and updated any corresponding files. The "blank" footers are for the documentation pages.
---
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-quarks-website pull request: Merged doc Jekyll repositor...
Posted by ddebrunner <gi...@git.apache.org>.
Github user ddebrunner commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/6#issuecomment-197316874
There seems to be something strange with footer which looked to be correct wrt incubation notices, but has been moved to footer_orig and replaced with an empty footer.
---
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-quarks-website pull request: Merged doc Jekyll repositor...
Posted by ddebrunner <gi...@git.apache.org>.
Github user ddebrunner commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/6#issuecomment-197317889
Same issue with head.
---
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-quarks-website pull request: Merged doc Jekyll repositor...
Posted by ddebrunner <gi...@git.apache.org>.
Github user ddebrunner commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/6#issuecomment-197577109
Can you reissue the request against master?
---
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-quarks-website pull request: Merged doc Jekyll repositor...
Posted by ddebrunner <gi...@git.apache.org>.
Github user ddebrunner commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/6#issuecomment-197323717
Kathey said:
> I already merged quarks-2-pr-3 to master and deleted the branch, so the doc pull request should be against master.
https://issues.apache.org/jira/browse/QUARKS-2?focusedCommentId=15195505&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-15195505
---
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-quarks-website pull request: Merged doc Jekyll repositor...
Posted by ddebrunner <gi...@git.apache.org>.
Github user ddebrunner commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/6#issuecomment-197875691
> I renamed the files from the main landing page to *_orig.html
Somewhat confusing, maybe the files could be given logical names. _orig tends to be used for when a file has been replaced with a newer version. I would have expected something like footer & footer_doc or footer_main and footer_doc.
---
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.
---