You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@edgent.apache.org by dlaboss <gi...@git.apache.org> on 2017/12/18 19:34:45 UTC
[GitHub] incubator-edgent-website pull request #98: fix adding release 1.2.0 javadoc
GitHub user dlaboss opened a pull request:
https://github.com/apache/incubator-edgent-website/pull/98
fix adding release 1.2.0 javadoc
- add site/javadoc/r1.2.0 content
- add site/javadoc/latest content
- update topnav javadoc pulldown
- fix downloads page's 1.2.0 Javadoc link to be site-relative (to work with "jekyll serve" local test site)
I previously accidentally made a javadoc-1.2.0 branch directly on my clone of the asf repo (https://git-wip-us.apache.org/repos/asf/incubator-edgent-website.git). Continuing, I then manually merged it to master, pushed, did the build.sh to update my asf-site branch and then did the "git push origin asf-site" to update the asf repo and website.
But the website didn't update and the github mirror isn't showing the commits (below) on master or ast-site branch. So trying this PR way to see if I can straighten things out (perhaps a mistake).
```
in my asfclone
@dales-mbp:1213> git log master | head
commit a64ead3a8a7e7f5acef0542de51c27d509c3e3ed
Author: Dale LaBossiere <dl...@us.ibm.com>
Date: Mon Dec 18 13:07:53 2017 -0500
add r1.2.0 javadoc
commit cbdf09ba624b43bb0b1e04b3dfa92822074a1327
@dales-mbp:1214> git log asf-site | head
commit 21e277e0385c153f411e6f39c156ef56482894ed
Author: Dale LaBossiere <dl...@us.ibm.com>
Date: Mon Dec 18 13:28:51 2017 -0500
from a64ead3a8a7e7f5acef0542de51c27d509c3e3ed
commit 9b42cd733260ae776de6ee9cfe745a6006207e4e
```
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/dlaboss/incubator-edgent-website fix-javadoc-1.2.0
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-edgent-website/pull/98.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 #98
----
commit 1d74f4c030b7ba91ee3052633b8aafac15d6919c
Author: Dale LaBossiere <dl...@us.ibm.com>
Date: 2017-12-18T18:52:02Z
fix adding release 1.2.0 javadoc
----
---
[GitHub] incubator-edgent-website pull request #98: fix adding release 1.2.0 javadoc
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-edgent-website/pull/98
---