cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject git commit: updated refs/heads/master to 70e78db
Date Mon, 13 May 2013 18:34:01 GMT
Updated Branches:
  refs/heads/master 35164fde6 -> 70e78db3c


Fix gslb documentation


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

Branch: refs/heads/master
Commit: 70e78db3c717fefdcd3cb507cc5fa01c6d1354f9
Parents: 35164fd
Author: Nitin Mehta <nitin.mehta@citrix.com>
Authored: Tue May 14 00:03:49 2013 +0530
Committer: Nitin Mehta <nitin.mehta@citrix.com>
Committed: Tue May 14 00:03:49 2013 +0530

----------------------------------------------------------------------
 docs/en-US/gslb.xml |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/70e78db3/docs/en-US/gslb.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/gslb.xml b/docs/en-US/gslb.xml
index 1b692df..a312b94 100644
--- a/docs/en-US/gslb.xml
+++ b/docs/en-US/gslb.xml
@@ -157,7 +157,6 @@
   </section>
   <section id="gslb-workflow">
     <title>Configuring GSLB</title>
-<<<<<<< HEAD
     <para>A GSLB deployment is the logical collection of GSLB virtual server, GSLB
service, LB
       virtual server, service, domain, and ADNS service. To create a GSLB site, you must
configure
       load balancing in the zone. You must create GSLB vservers and GSLB services for each
site. You
@@ -181,7 +180,6 @@
       on the two appliances at the two different sites are identical, although each sites
       load-balancing configuration is specific to that site.</para>
     <para>Perform the following as a cloud administrator. As per the above example,
the
-=======
     <para>To configure a GSLB deployment, you must first configure a standard load
balancing setup
       for each zone. This enables you to balance load across the different servers in each
zone in
       the region. Then on the NetScaler side, configure both NetScaler appliances that you
plan to
@@ -191,7 +189,6 @@
       configurations on the two appliances at the two different zones are identical, although
each
       sites load-balancing configuration is specific to that site.</para>
     <para>Perform the following as a cloud administrator. As per the example given
above, the
->>>>>>> master
       administrator of xyztelco is the one who sets up GSLB:</para>
     <orderedlist>
       <listitem>
@@ -212,13 +209,10 @@
                 >Configuring an Authoritative DNS Service</ulink>.</para>
           </listitem>
           <listitem>
-<<<<<<< HEAD
             <para>Configure a GSLB site with site name formed from the domain name
details.</para>
-=======
             <para>Configure a GSLB site with the site name formed from the domain name.</para>
             <para>As per the example given above, the site names are A.xyztelco.com
and
               B.xyztelco.com.</para>
->>>>>>> master
             <para>For more information, see <ulink
                 url="http://support.citrix.com/proddocs/topic/netscaler-traffic-management-10-map/ns-gslb-config-basic-site-tsk.html"
                 >Configuring a Basic GSLB Site</ulink>.</para>
@@ -477,10 +471,7 @@
     </section>
     <section id="assign-lb-gslb">
       <title>Assigning Load Balancing Rules to GSLB</title>
-<<<<<<< HEAD
       <para/>
-=======
->>>>>>> master
       <orderedlist>
         <listitem>
           <para>Log in to the &PRODUCT; UI as a domain administrator or user.</para>


Mime
View raw message