Merged the file with the master branch
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/97e4906d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/97e4906d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/97e4906d Branch: refs/heads/vpc Commit: 97e4906d8c15b643f5261b039fb88cbd67d6ca7e Parents: 60f1dbe Author: Alena Prokharchyk <[email protected]> Authored: Thu Aug 9 21:13:23 2012 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Thu Aug 9 23:30:33 2012 -0700 ---------------------------------------------------------------------- .../api/commands/CreatePhysicalNetworkCmd.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/97e4906d/api/src/com/cloud/api/commands/CreatePhysicalNetworkCmd.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/api/commands/CreatePhysicalNetworkCmd.java b/api/src/com/cloud/api/commands/CreatePhysicalNetworkCmd.java index 34b5f3b..537b9be 100644 --- a/api/src/com/cloud/api/commands/CreatePhysicalNetworkCmd.java +++ b/api/src/com/cloud/api/commands/CreatePhysicalNetworkCmd.java @@ -59,15 +59,13 @@ public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd { @Parameter(name=ApiConstants.DOMAIN_ID, type=CommandType.LONG, description="domain ID of the account owning a physical network") private Long domainId; - @Parameter(name=ApiConstants.BROADCAST_DOMAIN_RANGE, type=CommandType.STRING, description="the broadcast domain " + - "range for the physical network[Pod or Zone]. In Acton release it can be Zone only in Advance zone, and Pod in Basic") + @Parameter(name=ApiConstants.BROADCAST_DOMAIN_RANGE, type=CommandType.STRING, description="the broadcast domain range for the physical network[Pod or Zone]. In Acton release it can be Zone only in Advance zone, and Pod in Basic") private String broadcastDomainRange; @Parameter(name=ApiConstants.TAGS, type=CommandType.LIST, collectionType=CommandType.STRING, description="Tag the physical network") private List<String> tags; - @Parameter(name=ApiConstants.ISOLATION_METHODS, type=CommandType.LIST, collectionType=CommandType.STRING, - description="the isolation method for the physical network[VLAN/L3/GRE]") + @Parameter(name=ApiConstants.ISOLATION_METHODS, type=CommandType.LIST, collectionType=CommandType.STRING, description="the isolation method for the physical network[VLAN/L3/GRE]") private List<String> isolationMethods; @Parameter(name=ApiConstants.NAME, type=CommandType.STRING, required=true, description="the name of the physical network")
