cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From radh...@apache.org
Subject [2/2] git commit: updated refs/heads/4.2-forward to fb4c8b3
Date Tue, 27 Aug 2013 06:14:00 GMT
vpc review comments


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fb4c8b35
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fb4c8b35
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fb4c8b35

Branch: refs/heads/4.2-forward
Commit: fb4c8b35e5d24861f76c0ef375cfd22305040a8c
Parents: cd4f93c
Author: radhikap <radhika.puthiyetath@citrix.com>
Authored: Tue Aug 27 11:31:45 2013 +0530
Committer: radhikap <radhika.puthiyetath@citrix.com>
Committed: Tue Aug 27 11:43:27 2013 +0530

----------------------------------------------------------------------
 docs/en-US/add-loadbalancer-rule-vpc.xml | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fb4c8b35/docs/en-US/add-loadbalancer-rule-vpc.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-loadbalancer-rule-vpc.xml b/docs/en-US/add-loadbalancer-rule-vpc.xml
index 618d7b9..3c164c2 100644
--- a/docs/en-US/add-loadbalancer-rule-vpc.xml
+++ b/docs/en-US/add-loadbalancer-rule-vpc.xml
@@ -387,6 +387,9 @@
           >physical_network_name</emphasis>&gt; > <emphasis role="bold">Network
Service
           Providers</emphasis> > <emphasis role="bold">Internal LB VM</emphasis>.
You can manage the
         Internal LB VMs as and when required from the location.</para>
+<<<<<<< HEAD
+>>>>>>> 030fe5b... review comments for CLOUDSTACK-2808, CLOUDSTACK-769
+=======
 >>>>>>> 030fe5b... review comments for CLOUDSTACK-2808, CLOUDSTACK-769
       <orderedlist>
         <listitem>
@@ -422,10 +425,13 @@
             </listitem>
             <listitem>
 <<<<<<< HEAD
+<<<<<<< HEAD
               <para><emphasis role="bold">Source IP Address</emphasis>:
The source IP from which
                 traffic originates. Typically, this is the IP of an instance on another tier
within
                 your VPC.</para>
 =======
+=======
+>>>>>>> 030fe5b... review comments for CLOUDSTACK-2808, CLOUDSTACK-769
               <para><emphasis role="bold">Source IP Address</emphasis>:
(Optional) The source IP
                 from which traffic originates. The IP is acquired from the CIDR of that particular
                 tier on which you want to create the Internal LB rule. If not specified,
the IP


Mime
View raw message