Return-Path: 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 9BF65107C6 for ; Tue, 27 Aug 2013 08:54:01 +0000 (UTC) Received: (qmail 25659 invoked by uid 500); 27 Aug 2013 08:54:01 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 25391 invoked by uid 500); 27 Aug 2013 08:54:01 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 25355 invoked by uid 99); 27 Aug 2013 08:53:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Aug 2013 08:53:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CC8E41EBBD; Tue, 27 Aug 2013 08:53:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: radhika@apache.org To: commits@cloudstack.apache.org Date: Tue, 27 Aug 2013 08:53:59 -0000 Message-Id: <73d2ddae2a46482685839f1593f24fe1@git.apache.org> In-Reply-To: <291f317e35fd48e9b85201c3dbf62319@git.apache.org> References: <291f317e35fd48e9b85201c3dbf62319@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/4.2-forward to 6da0eb4 CLOUDSTACK-772 review comments on DVS fixed Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6da0eb4b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6da0eb4b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6da0eb4b Branch: refs/heads/4.2-forward Commit: 6da0eb4b8bbaa7348b779674654ec4ce9c09c441 Parents: e014571 Author: radhikap Authored: Tue Aug 27 14:23:30 2013 +0530 Committer: radhikap Committed: Tue Aug 27 14:23:30 2013 +0530 ---------------------------------------------------------------------- docs/en-US/vmware-cluster-config-dvswitch.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6da0eb4b/docs/en-US/vmware-cluster-config-dvswitch.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/vmware-cluster-config-dvswitch.xml b/docs/en-US/vmware-cluster-config-dvswitch.xml index 173055f..311673a 100644 --- a/docs/en-US/vmware-cluster-config-dvswitch.xml +++ b/docs/en-US/vmware-cluster-config-dvswitch.xml @@ -78,8 +78,6 @@ Use this VDS name when you specify the switch name in the traffic label while creating the zone. Traffic label format is [["Name of vSwitch/dvSwitch/EthernetPortProfile"][,"VLAN ID"[,"vSwitch Type"]]] -<<<<<<< HEAD -======= The possible values for traffic labels are: empty string @@ -155,7 +153,6 @@ ->>>>>>> 6fc98a8... CLOUDSTACK-772 review comments on DVS fixed
Enabling Virtual Distributed Switch in &PRODUCT; @@ -166,8 +163,8 @@ &PRODUCT; uses VDS for virtual network infrastructure if the value of vmware.use.dvswitch parameter is true and the value of vmware.use.nexus.dvswitch parameter is false. Another global parameter that defines VDS configuration is vmware.ports.per.dvportgroup. This is the - default number of ports per VMware dvPortGroup in a VMware environment. This number directly - associated with the number of guest network you can create. + default number of ports per VMware dvPortGroup in a VMware environment. Default value is 256. + This number directly associated with the number of guest network you can create. &PRODUCT; supports orchestration of virtual networks in a deployment with a mix of Virtual Distributed Switch, Standard Virtual Switch and Nexus 1000v Virtual Switch.
@@ -257,5 +254,4 @@ -