You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/22 12:58:18 UTC
[2/3] git commit: updated refs/heads/master to 32fa9e6
CLOUDSTACK-9048: Fix typo for public network description
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2f5a4006
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2f5a4006
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2f5a4006
Branch: refs/heads/master
Commit: 2f5a40065c599fc78658a0898f9c6e6b29d70f51
Parents: 04f7208
Author: Carles Figuerola <Ca...@orbitz.com>
Authored: Mon Nov 9 11:18:44 2015 -0600
Committer: Carles Figuerola <Ca...@orbitz.com>
Committed: Mon Nov 9 11:18:44 2015 -0600
----------------------------------------------------------------------
.../api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java | 2 +-
.../cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java | 2 +-
.../cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java | 2 +-
core/src/com/cloud/resource/ServerResourceBase.java | 2 +-
tools/ngui/precache.py | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f5a4006/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
index da0c1d3..f936765 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
@@ -95,7 +95,7 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
private Integer publicPort;
@Parameter(name = ApiConstants.OPEN_FIREWALL, type = CommandType.BOOLEAN, description = "if true, firewall rule for"
- + " source/end pubic port is automatically created; if false - firewall rule has to be created explicitely. If not specified 1) defaulted to false when LB"
+ + " source/end public port is automatically created; if false - firewall rule has to be created explicitely. If not specified 1) defaulted to false when LB"
+ " rule is being created for VPC guest network 2) in all other cases defaulted to true")
private Boolean openFirewall;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f5a4006/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
index 94db915..d85030e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
@@ -71,7 +71,7 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta
@Parameter(name = ApiConstants.OPEN_FIREWALL,
type = CommandType.BOOLEAN,
- description = "if true, firewall rule for source/end pubic port is automatically created; if false - firewall rule has to be created explicitly. Has value true by default")
+ description = "if true, firewall rule for source/end public port is automatically created; if false - firewall rule has to be created explicitly. Has value true by default")
private Boolean openFirewall;
@Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the CIDR list to forward traffic from")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f5a4006/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
index 2bef64e..9508fa5 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
@@ -73,7 +73,7 @@ public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd {
@Parameter(name = ApiConstants.OPEN_FIREWALL,
type = CommandType.BOOLEAN,
- description = "if true, firewall rule for source/end pubic port is automatically created; if false - firewall rule has to be created explicitely. Has value true by default")
+ description = "if true, firewall rule for source/end public port is automatically created; if false - firewall rule has to be created explicitely. Has value true by default")
private Boolean openFirewall;
@Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the vpn to the end user or not", since = "4.4", authorized = {RoleType.Admin})
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f5a4006/core/src/com/cloud/resource/ServerResourceBase.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/resource/ServerResourceBase.java b/core/src/com/cloud/resource/ServerResourceBase.java
index 69ddb29..f68bcf4 100644
--- a/core/src/com/cloud/resource/ServerResourceBase.java
+++ b/core/src/com/cloud/resource/ServerResourceBase.java
@@ -194,7 +194,7 @@ public abstract class ServerResourceBase implements ServerResource {
info = NetUtils.getNetworkParams(_publicNic);
if (info != null) {
if (s_logger.isDebugEnabled()) {
- s_logger.debug("Parameters for pubic nic: " + info[0] + " - " + info[1] + "-" + info[2]);
+ s_logger.debug("Parameters for public nic: " + info[0] + " - " + info[1] + "-" + info[2]);
}
cmd.setPublicIpAddress(info[0]);
cmd.setPublicMacAddress(info[1]);