You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cwanda <gi...@git.apache.org> on 2017/03/24 00:40:09 UTC
[GitHub] incubator-mynewt-site pull request #164: Various Updates to Doc to reflect 1...
GitHub user cwanda opened a pull request:
https://github.com/apache/incubator-mynewt-site/pull/164
Various Updates to Doc to reflect 1.0 release
1) Updated blinky for arduino zero, arduino primo, olimex, nRF52 -
Removed features, updated paths, general cleanup to make tutorials more consistent
2) Use updated olimex diagrams that shows power input select jumper location
so user can configure power source from JTAG/SWD
3) Fix typo in bleprph tutorial.
4) Updated Concepts section to use updated newt target -h output
5) Updated newt install for Mac and linux to use updated newt -h output.
6) Updated newt install for linux for GO version 1.6
7) Remove duplicate instance of Air Quality Sensor project from document tree
8) Removed embedded LUA from doc tree.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/cwanda/incubator-mynewt-site updates_1.0
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-mynewt-site/pull/164.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 #164
----
commit 986f2350c0dd3c312b50faf41556dff9c2de0f63
Author: cwanda <wa...@happycity.com>
Date: 2017-03-24T00:27:57Z
1) Updated blinky for arduino zero, arduino primo, olimex, nRF52 -
Removed features, updated paths, general cleanup to make tutorials more
consistent
2) Use updated olimex diagrams that include power input select jumper location
so user can configure power source from JTAG/SWD
3) Fix typo in bleprph tutorial.
4) Updated Concepts section to use updated newt target -h output
5) Updated newt install for Mac and linux to use updated newt -h output.
6) Updated newt install for linux for GO version 1.6
7) Remove duplicate instance of Air Quality Sensor project from document tree
8) Removed embedded LUA from doc tree.
----
---
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-mynewt-site issue #164: Various Updates to Doc to reflect 1.0 rele...
Posted by aditihilbert <gi...@git.apache.org>.
Github user aditihilbert commented on the issue:
https://github.com/apache/incubator-mynewt-site/pull/164
Not sure why this is not showing as merged. The changes have been pushed upstream and are visible on the website
---
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-mynewt-site issue #164: Various Updates to Doc to reflect 1.0 rele...
Posted by cwanda <gi...@git.apache.org>.
Github user cwanda commented on the issue:
https://github.com/apache/incubator-mynewt-site/pull/164
It looks like the reason it doesn't show as merged is because there were conflicts which I have fixed. So I believe you will need to merge the 2nd commit that resolves the conflicts. Sorry for the inconvenience.
I am not sure why there were conflicts. I think what might have happen is that I committed my original changes but then made some edits and amended my commit. I thought I had amended my commit before I pushed up to the repo. Still not sure why this would cause conflicts since the amended commit was done before the merge.
I hope this fixes the problem.
---
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-mynewt-site pull request #164: Various Updates to Doc to reflect 1...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-mynewt-site/pull/164
---
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.
---