Return-Path: 
 <commits-return-18068-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 4BEA7107BC
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Wed, 24 Apr 2013 23:03:14 +0000 (UTC)
Received: (qmail 45479 invoked by uid 500); 24 Apr 2013 23:03:11 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 45420 invoked by uid 500); 24 Apr 2013 23:03:11 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 44689 invoked by uid 99); 24 Apr 2013 23:03:10 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Apr 2013 23:03:10 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 9C2EB880815; Wed, 24 Apr 2013 23:03:10 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bfederle@apache.org
To: commits@cloudstack.apache.org
Date: Wed, 24 Apr 2013 23:03:42 -0000
Message-Id: <150be750f422402fbc2bbe6663c253ce@git.apache.org>
In-Reply-To: <6cb4a1e0844441f88f7bcd1a990dff25@git.apache.org>
References: <6cb4a1e0844441f88f7bcd1a990dff25@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [34/42] git commit: updated refs/heads/ui-vm-affinity to 25f2f0f

CLOUDSTACK-804 ui changes


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

Branch: refs/heads/ui-vm-affinity
Commit: 7e5fd88f7c1d5072c774d5278229de2a76d6da78
Parents: f65f3b9
Author: Radhika PC <radhika.puthiyetath@citrix.com>
Authored: Wed Apr 24 17:54:21 2013 +0530
Committer: unknown <radhikap@BANLRADHIKAP.citrite.net>
Committed: Wed Apr 24 22:08:19 2013 +0530

----------------------------------------------------------------------
 docs/en-US/images/add-vlan-icon.png |  Bin 0 -> 860 bytes
 docs/en-US/non-contiguous-vlan.xml  |   68 ++++++++++++++++++++++++++++++
 docs/en-US/vlan-provisioning.xml    |    2 +
 3 files changed, 70 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e5fd88f/docs/en-US/images/add-vlan-icon.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/add-vlan-icon.png b/docs/en-US/images/add-vlan-icon.png
new file mode 100644
index 0000000..04655dc
Binary files /dev/null and b/docs/en-US/images/add-vlan-icon.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e5fd88f/docs/en-US/non-contiguous-vlan.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/non-contiguous-vlan.xml b/docs/en-US/non-contiguous-vlan.xml
new file mode 100644
index 0000000..79fac83
--- /dev/null
+++ b/docs/en-US/non-contiguous-vlan.xml
@@ -0,0 +1,68 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ 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
+   http://www.apache.org/licenses/LICENSE-2.0
+ 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
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section id="non-contiguous-vlan">
+  <title>Non Contiguous VLAN Ranges</title>
+  <para>&PRODUCT; provides you with the flexibility to add non contiguous VLAN ranges to your
+    network. The administrator can either update an existing VLAN range or add multiple non
+    contiguous VLAN ranges while creating a zone. You can also use the UpdatephysicalNetwork API to
+    extend the VLAN range.</para>
+  <section id="add-vlan-range">
+    <title>Adding a New VLAN Range</title>
+    <orderedlist>
+      <listitem><para>Log in to the CloudPlatform UI as an administrator or end user.</para></listitem>
+      <listitem>
+        <para>Ensure that the VLAN range does not already exist.</para>
+      </listitem>
+      <listitem>
+        <para>Check whether the new VLAN range overlaps with any existing ones. If overlaps, extend
+          the existing range. If does not overlap, add the new range.</para>
+      </listitem>
+      <listitem>
+        <para>In the left navigation, choose Infrastructure. On Zones, click View More, then click the zone to
+          which you want to work with.</para>
+      </listitem>
+      <listitem>
+        <para>Click Physical Network.</para>
+      </listitem>
+      <listitem>
+        <para>In the Guest node of the diagram, click Configure.</para>
+      </listitem>
+      <listitem>
+        <para>Click Add VLAN Ranges button <inlinemediaobject>
+            <imageobject>
+              <imagedata fileref="./images/add-vlan-icon.png"/>
+            </imageobject>
+            <textobject>
+              <phrase>add-vlan-ico.png: button to add a VLAN range.</phrase>
+            </textobject>
+          </inlinemediaobject></para>
+        <para>The Add VLAN Ranges dialog is displayed.</para>
+      </listitem>
+      <listitem>
+        <para>Specify the start and end of the VLAN range.</para>
+      </listitem>
+      <listitem>
+      <para>Click OK.</para>
+      </listitem>
+    </orderedlist>
+  </section>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e5fd88f/docs/en-US/vlan-provisioning.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vlan-provisioning.xml b/docs/en-US/vlan-provisioning.xml
index 9345647..d37be16 100644
--- a/docs/en-US/vlan-provisioning.xml
+++ b/docs/en-US/vlan-provisioning.xml
@@ -40,4 +40,6 @@
     different physical NIC and use the same set of VLANs if you run out of VLANs. Another advantage
     is that you can use the same set of IPs for different customers, each one with their own routers
     and the guest networks on different physical NICs.</para>
+  <xi:include href="vlan-allocation-eg.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="non-contiguous-vlan.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </section>