You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by pdion891 <gi...@git.apache.org> on 2014/03/21 02:43:43 UTC
[GitHub] cloudstack-docs-admin pull request: fixed internal links, tables, ...
GitHub user pdion891 opened a pull request:
https://github.com/apache/cloudstack-docs-admin/pull/3
fixed internal links, tables, CLOUDSTACK-5954
Fixed internal links, forgotten tables and update-ssl.png file : CLOUDSTACK-5954
add default OS in .gitignore file.
```
$ sphinx-build -b html source build
Running Sphinx v1.2.2
loading pickled environment... done
building [html]: targets for 19 source files that are out of date
updating environment: 0 added, 0 changed, 0 removed
looking for now-outdated files... none found
preparing documents... done
writing output... [100%] virtual_machines
writing additional files... genindex search
copying images... [100%] _static/images/egress-firewall-rule.png
copying static files... done
copying extra files... done
dumping search index... done
dumping object inventory... done
build succeeded.
```
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/cloudops/cloudstack-docs-admin master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack-docs-admin/pull/3.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 #3
----
commit 6b2c8268f67328eaf2088166631dcd4d059521b0
Author: Pierre-Luc Dion <pd...@cloudops.com>
Date: 2014-03-20T01:29:33Z
fixed images links, tables, toctree
commit 08e60ee04b10be2437bfd701e002787ab8dafe97
Author: Pierre-Luc Dion <pd...@cloudops.com>
Date: 2014-03-21T01:30:33Z
fixed internal links, tables, CLOUDSTACK-5954
commit 0647b9740a15faf51cbb81894927271b611023bf
Author: Pierre-Luc Dion <pd...@cloudops.com>
Date: 2014-03-21T01:41:26Z
replaced â€\” by :
----
---
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] cloudstack-docs-admin pull request: fixed internal links, tables, ...
Posted by pdion891 <gi...@git.apache.org>.
Github user pdion891 closed the pull request at:
https://github.com/apache/cloudstack-docs-admin/pull/3
---
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] cloudstack-docs-admin pull request: fixed internal links, tables, ...
Posted by pdion891 <gi...@git.apache.org>.
GitHub user pdion891 reopened a pull request:
https://github.com/apache/cloudstack-docs-admin/pull/3
fixed internal links, tables, CLOUDSTACK-5954
Fixed internal links, forgotten tables and update-ssl.png file : CLOUDSTACK-5954
add default OS in .gitignore file.
```
$ sphinx-build -b html source build
Running Sphinx v1.2.2
loading pickled environment... done
building [html]: targets for 19 source files that are out of date
updating environment: 0 added, 0 changed, 0 removed
looking for now-outdated files... none found
preparing documents... done
writing output... [100%] virtual_machines
writing additional files... genindex search
copying images... [100%] _static/images/egress-firewall-rule.png
copying static files... done
copying extra files... done
dumping search index... done
dumping object inventory... done
build succeeded.
```
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/cloudops/cloudstack-docs-admin master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack-docs-admin/pull/3.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 #3
----
commit 6b2c8268f67328eaf2088166631dcd4d059521b0
Author: Pierre-Luc Dion <pd...@cloudops.com>
Date: 2014-03-20T01:29:33Z
fixed images links, tables, toctree
commit 08e60ee04b10be2437bfd701e002787ab8dafe97
Author: Pierre-Luc Dion <pd...@cloudops.com>
Date: 2014-03-21T01:30:33Z
fixed internal links, tables, CLOUDSTACK-5954
commit 0647b9740a15faf51cbb81894927271b611023bf
Author: Pierre-Luc Dion <pd...@cloudops.com>
Date: 2014-03-21T01:41:26Z
replaced â€\” by :
commit 2be0f91849ad8dbc5b3e77510f4f36ebb67ae6cd
Author: Pierre-Luc Dion <pd...@cloudops.com>
Date: 2014-03-21T14:40:22Z
fixing merge to upsteam
commit 8475ba5df612a7c2a4623102f3847fbc65b93bc2
Author: Pierre-Luc Dion <pd...@cloudops.com>
Date: 2014-03-21T15:06:41Z
fix merge to upstream
commit caa11839a39fab3a5352a8e01a698652a40ec6fd
Author: Pierre-Luc Dion <pd...@cloudops.com>
Date: 2014-03-21T15:13:17Z
fixed sphinx warnings
----
---
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.
---
Re: [GitHub] cloudstack-docs-admin pull request: fixed internal links, tables, ...
Posted by Sebastien Goasguen <ru...@gmail.com>.
On Mar 20, 2014, at 9:43 PM, pdion891 <gi...@git.apache.org> wrote:
> GitHub user pdion891 opened a pull request:
>
> https://github.com/apache/cloudstack-docs-admin/pull/3
>
> fixed internal links, tables, CLOUDSTACK-5954
>
> Fixed internal links, forgotten tables and update-ssl.png file : CLOUDSTACK-5954
> add default OS in .gitignore file.
>
> ```
> $ sphinx-build -b html source build
> Running Sphinx v1.2.2
> loading pickled environment... done
> building [html]: targets for 19 source files that are out of date
> updating environment: 0 added, 0 changed, 0 removed
> looking for now-outdated files... none found
> preparing documents... done
> writing output... [100%] virtual_machines
> writing additional files... genindex search
> copying images... [100%] _static/images/egress-firewall-rule.png
> copying static files... done
> copying extra files... done
> dumping search index... done
> dumping object inventory... done
> build succeeded.
> ```
>
> You can merge this pull request into a Git repository by running:
>
> $ git pull https://github.com/cloudops/cloudstack-docs-admin master
>
> Alternatively you can review and apply these changes as the patch at:
>
> https://github.com/apache/cloudstack-docs-admin/pull/3.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 #3
>
> ----
> commit 6b2c8268f67328eaf2088166631dcd4d059521b0
> Author: Pierre-Luc Dion <pd...@cloudops.com>
> Date: 2014-03-20T01:29:33Z
>
> fixed images links, tables, toctree
>
> commit 08e60ee04b10be2437bfd701e002787ab8dafe97
> Author: Pierre-Luc Dion <pd...@cloudops.com>
> Date: 2014-03-21T01:30:33Z
>
> fixed internal links, tables, CLOUDSTACK-5954
>
> commit 0647b9740a15faf51cbb81894927271b611023bf
> Author: Pierre-Luc Dion <pd...@cloudops.com>
> Date: 2014-03-21T01:41:26Z
>
> replaced â€\” by :
>
> ----
>
Pierre-Luc,
The patch does not apply, it looks like you did not pull the latest master which contains your previous patch.
Can you try to git pull the latest master and regenerate the patch ?
thanks
>
> ---
> 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] cloudstack-docs-admin pull request: fixed internal links, tables, ...
Posted by pdion891 <gi...@git.apache.org>.
Github user pdion891 commented on the pull request:
https://github.com/apache/cloudstack-docs-admin/pull/3#issuecomment-38286292
I've resync cloudops fork and commit changes. Should be working now.
Thanks,
---
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.
---
Re: [GitHub] cloudstack-docs-admin pull request: fixed internal links, tables, ...
Posted by Sebastien Goasguen <ru...@gmail.com>.
On Mar 20, 2014, at 10:33 PM, David Nalley <da...@gnsa.us> wrote:
> So originally 'concepts' appeared in almost every document. I didn't
> personally like that, so it's now in the root docs repo:
> http://docs.cloudstack.apache.org/en/latest/concepts.html
>
> That may not be the right location, but duplication of content didn't
> seem appropriate anymore.
>
Yes, I felt the same, so while doing the conversion I removed every duplication.
The concepts section needs a lot of work because this is going to be our landing page.
I ended moving the appendixes into their proper sections (events, alerts..etc). You might want to double check that they are there.
-sebastien
> --David
>
>
> On Thu, Mar 20, 2014 at 9:56 PM, Pierre-Luc Dion <pd...@cloudops.com> wrote:
>> I've update pretty much all internal links in the admin guide, although I
>> haven't found following sections:
>> - section #2 Cloud Infrastructure concept is missing ?
>> - appendixes
>>
>> Should I copy the old appendix in the admin guide ?
>>
>> Thanks,
>>
>>
>> Pierre-Luc Dion
>> Architecte de Solution Cloud | Cloud Solutions Architect
>> 514-447-3456, 1101
>> - - -
>>
>> *CloudOps*420 rue Guy
>> Montréal QC H3J 1S6
>> www.cloudops.com
>> @CloudOps_
>>
>>
>> On Thu, Mar 20, 2014 at 9:43 PM, pdion891 <gi...@git.apache.org> wrote:
>>
>>> GitHub user pdion891 opened a pull request:
>>>
>>> https://github.com/apache/cloudstack-docs-admin/pull/3
>>>
>>> fixed internal links, tables, CLOUDSTACK-5954
>>>
>>> Fixed internal links, forgotten tables and update-ssl.png file :
>>> CLOUDSTACK-5954
>>> add default OS in .gitignore file.
>>>
>>> ```
>>> $ sphinx-build -b html source build
>>> Running Sphinx v1.2.2
>>> loading pickled environment... done
>>> building [html]: targets for 19 source files that are out of date
>>> updating environment: 0 added, 0 changed, 0 removed
>>> looking for now-outdated files... none found
>>> preparing documents... done
>>> writing output... [100%] virtual_machines
>>> writing additional files... genindex search
>>> copying images... [100%] _static/images/egress-firewall-rule.png
>>> copying static files... done
>>> copying extra files... done
>>> dumping search index... done
>>> dumping object inventory... done
>>> build succeeded.
>>> ```
>>>
>>> You can merge this pull request into a Git repository by running:
>>>
>>> $ git pull https://github.com/cloudops/cloudstack-docs-admin master
>>>
>>> Alternatively you can review and apply these changes as the patch at:
>>>
>>> https://github.com/apache/cloudstack-docs-admin/pull/3.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 #3
>>>
>>> ----
>>> commit 6b2c8268f67328eaf2088166631dcd4d059521b0
>>> Author: Pierre-Luc Dion <pd...@cloudops.com>
>>> Date: 2014-03-20T01:29:33Z
>>>
>>> fixed images links, tables, toctree
>>>
>>> commit 08e60ee04b10be2437bfd701e002787ab8dafe97
>>> Author: Pierre-Luc Dion <pd...@cloudops.com>
>>> Date: 2014-03-21T01:30:33Z
>>>
>>> fixed internal links, tables, CLOUDSTACK-5954
>>>
>>> commit 0647b9740a15faf51cbb81894927271b611023bf
>>> Author: Pierre-Luc Dion <pd...@cloudops.com>
>>> Date: 2014-03-21T01:41:26Z
>>>
>>> replaced â EURO\" by :
>>>
>>> ----
>>>
>>>
>>> ---
>>> 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.
>>> ---
>>>
Re: [GitHub] cloudstack-docs-admin pull request: fixed internal
links, tables, ...
Posted by David Nalley <da...@gnsa.us>.
So originally 'concepts' appeared in almost every document. I didn't
personally like that, so it's now in the root docs repo:
http://docs.cloudstack.apache.org/en/latest/concepts.html
That may not be the right location, but duplication of content didn't
seem appropriate anymore.
--David
On Thu, Mar 20, 2014 at 9:56 PM, Pierre-Luc Dion <pd...@cloudops.com> wrote:
> I've update pretty much all internal links in the admin guide, although I
> haven't found following sections:
> - section #2 Cloud Infrastructure concept is missing ?
> - appendixes
>
> Should I copy the old appendix in the admin guide ?
>
> Thanks,
>
>
> Pierre-Luc Dion
> Architecte de Solution Cloud | Cloud Solutions Architect
> 514-447-3456, 1101
> - - -
>
> *CloudOps*420 rue Guy
> Montréal QC H3J 1S6
> www.cloudops.com
> @CloudOps_
>
>
> On Thu, Mar 20, 2014 at 9:43 PM, pdion891 <gi...@git.apache.org> wrote:
>
>> GitHub user pdion891 opened a pull request:
>>
>> https://github.com/apache/cloudstack-docs-admin/pull/3
>>
>> fixed internal links, tables, CLOUDSTACK-5954
>>
>> Fixed internal links, forgotten tables and update-ssl.png file :
>> CLOUDSTACK-5954
>> add default OS in .gitignore file.
>>
>> ```
>> $ sphinx-build -b html source build
>> Running Sphinx v1.2.2
>> loading pickled environment... done
>> building [html]: targets for 19 source files that are out of date
>> updating environment: 0 added, 0 changed, 0 removed
>> looking for now-outdated files... none found
>> preparing documents... done
>> writing output... [100%] virtual_machines
>> writing additional files... genindex search
>> copying images... [100%] _static/images/egress-firewall-rule.png
>> copying static files... done
>> copying extra files... done
>> dumping search index... done
>> dumping object inventory... done
>> build succeeded.
>> ```
>>
>> You can merge this pull request into a Git repository by running:
>>
>> $ git pull https://github.com/cloudops/cloudstack-docs-admin master
>>
>> Alternatively you can review and apply these changes as the patch at:
>>
>> https://github.com/apache/cloudstack-docs-admin/pull/3.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 #3
>>
>> ----
>> commit 6b2c8268f67328eaf2088166631dcd4d059521b0
>> Author: Pierre-Luc Dion <pd...@cloudops.com>
>> Date: 2014-03-20T01:29:33Z
>>
>> fixed images links, tables, toctree
>>
>> commit 08e60ee04b10be2437bfd701e002787ab8dafe97
>> Author: Pierre-Luc Dion <pd...@cloudops.com>
>> Date: 2014-03-21T01:30:33Z
>>
>> fixed internal links, tables, CLOUDSTACK-5954
>>
>> commit 0647b9740a15faf51cbb81894927271b611023bf
>> Author: Pierre-Luc Dion <pd...@cloudops.com>
>> Date: 2014-03-21T01:41:26Z
>>
>> replaced â EURO\" by :
>>
>> ----
>>
>>
>> ---
>> 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.
>> ---
>>
Re: [GitHub] cloudstack-docs-admin pull request: fixed internal
links, tables, ...
Posted by Pierre-Luc Dion <pd...@cloudops.com>.
I've update pretty much all internal links in the admin guide, although I
haven't found following sections:
- section #2 Cloud Infrastructure concept is missing ?
- appendixes
Should I copy the old appendix in the admin guide ?
Thanks,
Pierre-Luc Dion
Architecte de Solution Cloud | Cloud Solutions Architect
514-447-3456, 1101
- - -
*CloudOps*420 rue Guy
Montréal QC H3J 1S6
www.cloudops.com
@CloudOps_
On Thu, Mar 20, 2014 at 9:43 PM, pdion891 <gi...@git.apache.org> wrote:
> GitHub user pdion891 opened a pull request:
>
> https://github.com/apache/cloudstack-docs-admin/pull/3
>
> fixed internal links, tables, CLOUDSTACK-5954
>
> Fixed internal links, forgotten tables and update-ssl.png file :
> CLOUDSTACK-5954
> add default OS in .gitignore file.
>
> ```
> $ sphinx-build -b html source build
> Running Sphinx v1.2.2
> loading pickled environment... done
> building [html]: targets for 19 source files that are out of date
> updating environment: 0 added, 0 changed, 0 removed
> looking for now-outdated files... none found
> preparing documents... done
> writing output... [100%] virtual_machines
> writing additional files... genindex search
> copying images... [100%] _static/images/egress-firewall-rule.png
> copying static files... done
> copying extra files... done
> dumping search index... done
> dumping object inventory... done
> build succeeded.
> ```
>
> You can merge this pull request into a Git repository by running:
>
> $ git pull https://github.com/cloudops/cloudstack-docs-admin master
>
> Alternatively you can review and apply these changes as the patch at:
>
> https://github.com/apache/cloudstack-docs-admin/pull/3.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 #3
>
> ----
> commit 6b2c8268f67328eaf2088166631dcd4d059521b0
> Author: Pierre-Luc Dion <pd...@cloudops.com>
> Date: 2014-03-20T01:29:33Z
>
> fixed images links, tables, toctree
>
> commit 08e60ee04b10be2437bfd701e002787ab8dafe97
> Author: Pierre-Luc Dion <pd...@cloudops.com>
> Date: 2014-03-21T01:30:33Z
>
> fixed internal links, tables, CLOUDSTACK-5954
>
> commit 0647b9740a15faf51cbb81894927271b611023bf
> Author: Pierre-Luc Dion <pd...@cloudops.com>
> Date: 2014-03-21T01:41:26Z
>
> replaced â EURO\" by :
>
> ----
>
>
> ---
> 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] cloudstack-docs-admin pull request: fixed internal links, tables, ...
Posted by runseb <gi...@git.apache.org>.
Github user runseb commented on the pull request:
https://github.com/apache/cloudstack-docs-admin/pull/3#issuecomment-38423902
That patch still contains what you previously submitted and that I applied:
https://git-wip-us.apache.org/repos/asf?p=cloudstack-docs-admin.git;a=commit;h=08b01f0d623c47f63bd3ee4cc88b61c9bb891177
So it fails. I don't think your rebase worked. We need to try again.
---
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] cloudstack-docs-admin pull request: fixed internal links, tables, ...
Posted by pdion891 <gi...@git.apache.org>.
Github user pdion891 closed the pull request at:
https://github.com/apache/cloudstack-docs-admin/pull/3
---
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.
---