You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2013/08/01 12:22:05 UTC
git commit: updated refs/heads/4.2 to 57a82a1
Updated Branches:
refs/heads/4.2 f7555c1ec -> 57a82a171
https://issues.apache.org/jira/browse/CLOUDSTACK-817
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/57a82a17
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/57a82a17
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/57a82a17
Branch: refs/heads/4.2
Commit: 57a82a1715d88e8fb74fe0b7c2997703d33b7b49
Parents: f7555c1
Author: Radhika PC <ra...@citrix.com>
Authored: Thu Aug 1 15:51:23 2013 +0530
Committer: Radhika PC <ra...@citrix.com>
Committed: Thu Aug 1 15:51:23 2013 +0530
----------------------------------------------------------------------
docs/en-US/images/addAccount-icon.png | Bin 0 -> 605 bytes
docs/en-US/ip-vlan-tenant.xml | 2 +-
docs/en-US/networks.xml | 9 +++++----
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57a82a17/docs/en-US/images/addAccount-icon.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/addAccount-icon.png b/docs/en-US/images/addAccount-icon.png
new file mode 100644
index 0000000..4743dbe
Binary files /dev/null and b/docs/en-US/images/addAccount-icon.png differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57a82a17/docs/en-US/ip-vlan-tenant.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/ip-vlan-tenant.xml b/docs/en-US/ip-vlan-tenant.xml
index 42124f0..f66fde1 100644
--- a/docs/en-US/ip-vlan-tenant.xml
+++ b/docs/en-US/ip-vlan-tenant.xml
@@ -19,7 +19,7 @@
under the License.
-->
<section id="ip-vlan-tenant">
- <title>Dedicated Resources: Public IP Addresses and VLANs Per Account</title>
+ <title>Reserving Public IP Addresses and VLANs Per Account</title>
<para>&PRODUCT; provides you the ability to reserve a set of public IP addresses and VLANs
exclusively for an account. During zone creation, you can continue to define a set of VLANs and
multiple public IP ranges. This feature extends the functionality to enable you to dedicate a
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57a82a17/docs/en-US/networks.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/networks.xml b/docs/en-US/networks.xml
index 5d0c82a..b28f985 100644
--- a/docs/en-US/networks.xml
+++ b/docs/en-US/networks.xml
@@ -32,8 +32,13 @@
xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="using-multiple-guest-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="reserved-ip-addresses-non-csvms.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="ip-vlan-tenant.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="multiple-ip-nic.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="multiple-ip-range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="elastic-ip.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="portable-ip.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="add-ip-range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="pvlan.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="security-groups.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="external-firewalls-and-load-balancers.xml"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
@@ -47,10 +52,6 @@
<xi:include href="ip-load-balancing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="dns-dhcp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="vpn.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="elastic-ip.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="portable-ip.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="add-ip-range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="pvlan.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="inter-vlan-routing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="configure-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="persistent-network.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>