cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Chip Childers" <chip.child...@sungard.com>
Subject Re: Review Request: Add license headers to u-named files, fix DTDs, etc.
Date Mon, 13 Aug 2012 14:05:07 GMT

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/6553/#review10209
-----------------------------------------------------------


Joe,

This patch doesn't apply cleanly:

# git pull origin master
>From https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
 * branch            master     -> FETCH_HEAD
Already up-to-date.


# git apply ~/Downloads/add-license-u.patch
/Users/chip.childers/Downloads/add-license-u.patch:20: trailing whitespace.
 
/Users/chip.childers/Downloads/add-license-u.patch:22: trailing whitespace.
 
/Users/chip.childers/Downloads/add-license-u.patch:53: trailing whitespace.
 
/Users/chip.childers/Downloads/add-license-u.patch:55: trailing whitespace.
 
/Users/chip.childers/Downloads/add-license-u.patch:146: trailing whitespace.
 
error: patch failed: docs/en-US/ui.xml:1
error: docs/en-US/ui.xml: patch does not apply
error: patch failed: docs/en-US/upgrade-virtual-router-with-service-offering.xml:1
error: docs/en-US/upgrade-virtual-router-with-service-offering.xml: patch does not apply
error: patch failed: docs/en-US/upload-existing-volume-to-vm.xml:1
error: docs/en-US/upload-existing-volume-to-vm.xml: patch does not apply
error: patch failed: docs/en-US/upload-template.xml:1
error: docs/en-US/upload-template.xml: patch does not apply
error: patch failed: docs/en-US/usage-record-format.xml:1
error: docs/en-US/usage-record-format.xml: patch does not apply
error: patch failed: docs/en-US/usage-types.xml:1
error: docs/en-US/usage-types.xml: patch does not apply
error: patch failed: docs/en-US/user-services-overview.xml:1
error: docs/en-US/user-services-overview.xml: patch does not apply
error: patch failed: docs/en-US/using-multiple-guest-networks.xml:1
error: docs/en-US/using-multiple-guest-networks.xml: patch does not apply
error: patch failed: docs/en-US/using-netscaler-load-balancers.xml:28
error: docs/en-US/using-netscaler-load-balancers.xml: patch does not apply
error: patch failed: docs/en-US/using-swift-for-secondary-storage.xml:1
error: docs/en-US/using-swift-for-secondary-storage.xml: patch does not apply
error: patch failed: docs/en-US/using-vpn-with-mac.xml:1
error: docs/en-US/using-vpn-with-mac.xml: patch does not apply
error: patch failed: docs/en-US/using-vpn-with-windows.xml:1
error: docs/en-US/using-vpn-with-windows.xml: patch does not apply

- Chip Childers


On Aug. 12, 2012, 1:58 a.m., Joe Brockmeier wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/6553/
> -----------------------------------------------------------
> 
> (Updated Aug. 12, 2012, 1:58 a.m.)
> 
> 
> Review request for cloudstack.
> 
> 
> Description
> -------
> 
> Added Apache license to u-named files in the docs directory. Also fixed DTDs, added &PRODUCT;
entity for CloudPlatform mentions, removed unsupported tag (sect1) from using-sshkeys.xml
file, and other miscellaneous fixes.
> 
> 
> Diffs
> -----
> 
>   docs/en-US/ui.xml d01f1d2 
>   docs/en-US/upgrade-virtual-router-with-service-offering.xml 72cb433 
>   docs/en-US/upload-existing-volume-to-vm.xml da6e157 
>   docs/en-US/upload-template.xml 2021b6b 
>   docs/en-US/usage-record-format.xml 21dd326 
>   docs/en-US/usage-types.xml 868d331 
>   docs/en-US/use-project-view.xml 6935ee8 
>   docs/en-US/user-data-and-meta-data.xml 6724af7 
>   docs/en-US/user-services-overview.xml 3c24590 
>   docs/en-US/using-multiple-guest-networks.xml 1ff0804 
>   docs/en-US/using-netscaler-load-balancers.xml 61fb6fa 
>   docs/en-US/using-sshkeys.xml a753b32 
>   docs/en-US/using-swift-for-secondary-storage.xml a3b873b 
>   docs/en-US/using-vpn-with-mac.xml 0104d85 
>   docs/en-US/using-vpn-with-windows.xml 77389f9 
> 
> Diff: https://reviews.apache.org/r/6553/diff/
> 
> 
> Testing
> -------
> 
> Did a test publican build ("publican build --format=test --langs=en-US --config=publican-all.cfg")
to make sure no build-breaking errors were introduced.
> 
> 
> Thanks,
> 
> Joe Brockmeier
> 
>


Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message