Updated Branches: refs/heads/master e74f72be3 -> 8f70ee08e
Fix the unsolved conflicts for doc build Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8f70ee08 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8f70ee08 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8f70ee08 Branch: refs/heads/master Commit: 8f70ee08e051e969317465897a6660239b468da7 Parents: e74f72b Author: Kelven Yang <[email protected]> Authored: Fri Feb 1 17:22:51 2013 -0800 Committer: Kelven Yang <[email protected]> Committed: Fri Feb 1 17:22:51 2013 -0800 ---------------------------------------------------------------------- ...dvanced-zone-physical-network-configuration.xml | 14 ------- docs/en-US/cloud-infrastructure-concepts.xml | 11 ----- docs/en-US/host-add.xml | 9 ---- docs/en-US/primary-storage-add.xml | 30 --------------- docs/en-US/projects.xml | 11 ----- docs/en-US/provisioning-steps.xml | 4 -- 6 files changed, 0 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8f70ee08/docs/en-US/advanced-zone-physical-network-configuration.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/advanced-zone-physical-network-configuration.xml b/docs/en-US/advanced-zone-physical-network-configuration.xml index 8a68c2d..e47c0fd 100644 --- a/docs/en-US/advanced-zone-physical-network-configuration.xml +++ b/docs/en-US/advanced-zone-physical-network-configuration.xml @@ -10,13 +10,7 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at -<<<<<<< HEAD - http://www.apache.org/licenses/LICENSE-2.0 - -======= - http://www.apache.org/licenses/LICENSE-2.0 ->>>>>>> master Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -25,13 +19,6 @@ under the License. --> <section id="advanced-zone-physical-network-configuration"> -<<<<<<< HEAD - <title>Advanced Zone Physical Network Configuration</title> - <para>Within a zone that uses advanced networking, you need to tell the Management Server how the physical network is set up to carry different kinds of traffic in isolation.</para> - <xi:include href="configure-guest-traffic-in-advanced-zone.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="configure-public-traffic-in-an-advanced-zone.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> -</section> -======= <title>Advanced Zone Physical Network Configuration</title> <para>Within a zone that uses advanced networking, you need to tell the Management Server how the physical network is set up to carry different kinds of traffic in isolation.</para> @@ -40,4 +27,3 @@ <xi:include href="configure-public-traffic-in-an-advanced-zone.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> </section> ->>>>>>> master http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8f70ee08/docs/en-US/cloud-infrastructure-concepts.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/cloud-infrastructure-concepts.xml b/docs/en-US/cloud-infrastructure-concepts.xml index df59fed..7a7098a 100644 --- a/docs/en-US/cloud-infrastructure-concepts.xml +++ b/docs/en-US/cloud-infrastructure-concepts.xml @@ -24,16 +24,6 @@ <chapter id="cloud-infrastructure-concepts"> <title>Cloud Infrastructure Concepts</title> -<<<<<<< HEAD - <xi:include href="about-zones.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="about-pods.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="about-clusters.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="about-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="about-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="about-secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="about-physical-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> -</chapter> -======= <xi:include href="about-zones.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="about-pods.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="about-clusters.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> @@ -42,4 +32,3 @@ <xi:include href="about-secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="about-physical-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> </chapter> ->>>>>>> master http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8f70ee08/docs/en-US/host-add.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/host-add.xml b/docs/en-US/host-add.xml index cf67dd3..c602d36 100644 --- a/docs/en-US/host-add.xml +++ b/docs/en-US/host-add.xml @@ -27,11 +27,6 @@ <orderedlist> <listitem><para>Before adding a host to the &PRODUCT; configuration, you must first install your chosen hypervisor on the host. &PRODUCT; can manage hosts running VMs under a variety of hypervisors.</para> <para>The &PRODUCT; Installation Guide provides instructions on how to install each supported hypervisor -<<<<<<< HEAD - and configure it for use with &PRODUCT;. See the Installation Guide for information about which version of your chosen hypervisor is supported, as well as crucial additional steps to configure the hosts for use with &PRODUCT;.</para> -======= - and configure it for use with &PRODUCT;. See the appropriate section in the Installation Guide for information about which version of your chosen hypervisor is supported, as well as crucial additional steps to configure the hypervisor hosts for use with &PRODUCT;.</para> ->>>>>>> master <warning><para>Be sure you have performed the additional &PRODUCT;-specific configuration steps described in the hypervisor installation section for your particular hypervisor.</para></warning> </listitem> <listitem><para>Now add the hypervisor host to &PRODUCT;. The technique to use varies depending on the hypervisor.</para> @@ -43,8 +38,4 @@ </orderedlist> <xi:include href="host-add-xenserver-kvm-ovm.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="host-add-vsphere.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> -<<<<<<< HEAD </section> -======= -</section> ->>>>>>> master http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8f70ee08/docs/en-US/primary-storage-add.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/primary-storage-add.xml b/docs/en-US/primary-storage-add.xml index bebbc5c..067cf71 100644 --- a/docs/en-US/primary-storage-add.xml +++ b/docs/en-US/primary-storage-add.xml @@ -23,13 +23,6 @@ --> <section id="primary-storage-add"> -<<<<<<< HEAD - <title>Adding Primary Storage</title> - <note><para>Ensure that nothing stored on the server. Adding the server to &PRODUCT; will destroy any existing data.</para></note> - <para>When you create a new zone, the first primary storage is added as part of that procedure. You can add primary storage servers at any time, such as when adding a new cluster or adding more servers to an existing cluster.</para> - <orderedlist> - <listitem><para>Log in to the &PRODUCT; UI.</para></listitem> -======= <title>Add Primary Storage</title> <section id="sys-require-primary-storage"> <title>System Requirements for Primary Storage</title> @@ -51,32 +44,10 @@ <warning><para>Be sure there is nothing stored on the server. Adding the server to &PRODUCT; will destroy any existing data.</para></warning> <orderedlist> <listitem><para>Log in to the &PRODUCT; UI (see <xref linkend="log-in" />).</para></listitem> ->>>>>>> master <listitem><para>In the left navigation, choose Infrastructure. In Zones, click View More, then click the zone in which you want to add the primary storage.</para></listitem> <listitem><para>Click the Compute tab.</para></listitem> <listitem><para>In the Primary Storage node of the diagram, click View All.</para></listitem> <listitem><para>Click Add Primary Storage.</para></listitem> -<<<<<<< HEAD - <listitem><para>Provide the following information in the dialog. The information required varies depending on your choice in Protocol.</para> - <itemizedlist> - <listitem><para>Pod. The pod for the storage device.</para></listitem> - <listitem><para>Cluster. The cluster for the storage device.</para></listitem> - <listitem><para>Name. The name of the storage device</para></listitem> - <listitem><para>Protocol. For XenServer, choose either NFS, iSCSI, or PreSetup. For KVM, choose NFS or SharedMountPoint. For vSphere choose either VMFS (iSCSI or FiberChannel) or NFS</para></listitem> - <listitem><para>Server (for NFS, iSCSI, or PreSetup). The IP address or DNS name of the storage device</para></listitem> - <listitem><para>Server (for VMFS). The IP address or DNS name of the vCenter server.</para></listitem> - <listitem><para>Path (for NFS). In NFS this is the exported path from the server.</para></listitem> - <listitem><para>Path (for VMFS). In vSphere this is a combination of the datacenter name and the datastore name. The format is "/" datacenter name "/" datastore name. For example, "/cloud.dc.VM/cluster1datastore".</para></listitem> - <listitem><para>Path (for SharedMountPoint). With KVM this is the path on each host that is where this primary storage is mounted. For example, "/mnt/primary".</para></listitem> - <listitem><para>SR Name-Label (for PreSetup). Enter the name-label of the SR that has been set up outside &PRODUCT;.</para></listitem> - <listitem><para>Target IQN (for iSCSI). In iSCSI this is the IQN of the target. For example, iqn.1986-03.com.sun:02:01ec9bb549-1271378984</para></listitem> - <listitem><para>Lun # (for iSCSI). In iSCSI this is the LUN number. For example, 3.</para></listitem> - <listitem><para>Tags (optional). The comma-separated list of tags for this storage device. It should be an equivalent set or superset of the tags on your disk offerings</para></listitem> - </itemizedlist> - <para>The tag sets on primary storage across clusters in a Zone must be identical. For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.</para></listitem> - <listitem><para>Click OK.</para></listitem> - </orderedlist> -======= <listitem> <para>Provide the following information in the dialog. The information required varies depending on your choice in Protocol.</para> <itemizedlist> @@ -100,5 +71,4 @@ </orderedlist> </section> ->>>>>>> master </section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8f70ee08/docs/en-US/projects.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/projects.xml b/docs/en-US/projects.xml index 862223d..39ce96b 100644 --- a/docs/en-US/projects.xml +++ b/docs/en-US/projects.xml @@ -25,20 +25,9 @@ <chapter id="projects"> <title>Using Projects to Organize Users and Resources</title> <xi:include href="projects-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> -<<<<<<< HEAD - <xi:include href="set-up-invitations.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="configuring-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="set-resource-limits-for-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="set-projects-creator-permissions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="create-new-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="add-members-to-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="send-projects-membership-invitation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="add-projects-members-from-ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> -======= - <xi:include href="configuring-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="create-new-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="add-members-to-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> ->>>>>>> master <xi:include href="accept-membership-invite.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="suspend-project.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="use-project-view.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8f70ee08/docs/en-US/provisioning-steps.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/provisioning-steps.xml b/docs/en-US/provisioning-steps.xml index dc6cbad..8777b02 100644 --- a/docs/en-US/provisioning-steps.xml +++ b/docs/en-US/provisioning-steps.xml @@ -21,10 +21,6 @@ specific language governing permissions and limitations under the License. --> -<<<<<<< HEAD -======= - ->>>>>>> master <chapter id="provisioning-steps"> <title>Steps to Provisioning Your Cloud Infrastructure</title> <para>This section tells how to add zones, pods, clusters, hosts, storage, and networks to your cloud. If you are unfamiliar with these entities, please begin by looking through <xref linkend="cloud-infrastructure-concepts" />.</para>
