You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by ahgittin <gi...@git.apache.org> on 2015/07/24 16:23:11 UTC
[GitHub] incubator-brooklyn pull request: Docs troubleshooting
GitHub user ahgittin opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/768
Docs troubleshooting
Fix merge conflicts from #765 (moving @nakomis 's "exceptions" troubleshooting) and attempt to update titles so menu is more intuitive. @aledsage feedback welcome. BTW merging this should close #765 due to the commit history.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ahgittin/incubator-brooklyn docs-troubleshooting
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/768.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 #768
----
commit b8cc522efffbfdae954aa5746bc15cf24ac12db1
Author: Aled Sage <al...@gmail.com>
Date: 2015-07-24T02:47:23Z
Adds docs ops/troubleshooting
- Moves troubleshooting-connectivity from dev/tips to ops
- Adds troubleshooting guides for:
- runtime-errors
- deployment
- software process
commit 692045b4c09b1d3973a490b0569d4c63930ed842
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Date: 2015-07-24T13:42:11Z
This closes #765
Conflicts:
docs/guide/dev/index.md -- troubleshooting-exceptions had been added as tips; i've moved it to the new troubleshooting directory
commit 1e22d053e221f6ae9b192cb4c1bba5c38bf4e434
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Date: 2015-07-24T14:18:51Z
rejig titles of troubleshooting sections
----
---
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-brooklyn pull request: Docs troubleshooting
Posted by ahgittin <gi...@git.apache.org>.
Github user ahgittin commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/768#issuecomment-124541634
Updated following #766 merger. For the avoidance of doubt probably manually close #765.
---
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-brooklyn pull request: Docs troubleshooting
Posted by hzbarcea <gi...@git.apache.org>.
Github user hzbarcea commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/768#issuecomment-124783390
+1
---
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-brooklyn pull request: Docs troubleshooting
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/768#issuecomment-125659052
Thanks @ahgittin - merging.
---
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-brooklyn pull request: Docs troubleshooting
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-brooklyn/pull/768
---
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-brooklyn pull request: Docs troubleshooting
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/768#discussion_r35448623
--- Diff: docs/guide/ops/troubleshooting/index.md ---
@@ -0,0 +1,19 @@
+---
+title: Troubleshooting
+layout: website-normal
+children:
+<<<<<<< HEAD
--- End diff --
Merge conflict text has sneaked in.
---
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-brooklyn pull request: Docs troubleshooting
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/768#issuecomment-124600458
Thanks @ahgittin - changes make sense. Only one minor thing where merge conflict text has sneaked into file. Once that's fixed, please do merge!
---
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.
---