cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sebastien Goasguen <run...@gmail.com>
Subject Re: [GitHub] cloudstack-docs-admin pull request: fixed internal links, tables, ...
Date Fri, 21 Mar 2014 08:35:38 GMT

On Mar 20, 2014, at 9:43 PM, pdion891 <git@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 <pdion@cloudops.com>
> Date:   2014-03-20T01:29:33Z
> 
>    fixed images links, tables, toctree
> 
> commit 08e60ee04b10be2437bfd701e002787ab8dafe97
> Author: Pierre-Luc Dion <pdion@cloudops.com>
> Date:   2014-03-21T01:30:33Z
> 
>    fixed internal links, tables, CLOUDSTACK-5954
> 
> commit 0647b9740a15faf51cbb81894927271b611023bf
> Author: Pierre-Luc Dion <pdion@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.
> ---


Mime
View raw message