This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 34ada07 s/pacakge/package (#2812)
34ada07 is described below
commit 34ada079d33db486077dff43d36294cc9a308d88
Author: Bruno P. Kinoshita <[email protected]>
AuthorDate: Mon Aug 20 20:14:25 2018 +1200
s/pacakge/package (#2812)
---
packaging/build-deb.sh | 2 +-
packaging/package.sh | 2 +-
.../src/main/java/com/cloud/api/commands/RegisterServicePackageCmd.java | 2 +-
.../src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/packaging/build-deb.sh b/packaging/build-deb.sh
index e8c1783..e9d2399 100755
--- a/packaging/build-deb.sh
+++ b/packaging/build-deb.sh
@@ -46,7 +46,7 @@ Usage: ./build-deb.sh [OPTIONS]...
Package CloudStack for Debian based distribution.
If there's a "branding" string in the POM version (e.g.
x.y.z.a-NAME[-SNAPSHOT]), the branding name will
-be used in the final generated pacakge like:
cloudstack-management_x.y.z.a-NAME-SNAPSHOT~xenial_all.deb
+be used in the final generated package like:
cloudstack-management_x.y.z.a-NAME-SNAPSHOT~xenial_all.deb
note that you can override/provide "branding" string with "-b, --brand" flag
as well.
Optional arguments:
diff --git a/packaging/package.sh b/packaging/package.sh
index 7432da7..fe96eac 100755
--- a/packaging/package.sh
+++ b/packaging/package.sh
@@ -22,7 +22,7 @@ Usage: ./package.sh -d DISTRO [OPTIONS]...
Package CloudStack for specific distribution and provided options.
If there's a "branding" string in the POM version (e.g.
x.y.z.a-NAME[-SNAPSHOT]), the branding name will
-be used in the final generated pacakge like:
cloudstack-management-x.y.z.a-NAME.NUMBER.el7.centos.x86_64
+be used in the final generated package like:
cloudstack-management-x.y.z.a-NAME.NUMBER.el7.centos.x86_64
note that you can override/provide "branding" string with "-b, --brand" flag
as well.
Mandatory arguments:
diff --git
a/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/RegisterServicePackageCmd.java
b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/RegisterServicePackageCmd.java
index fdef005..ae2d59b 100644
---
a/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/RegisterServicePackageCmd.java
+++
b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/RegisterServicePackageCmd.java
@@ -69,7 +69,7 @@ public class RegisterServicePackageCmd extends BaseCmd {
} catch (CloudRuntimeException runtimeExcp) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR,
runtimeExcp.getMessage());
} catch (EntityExistsException runtimeExcp) {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Service
Pacakge Already Exists with Name " + getSpName());
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Service
Package Already Exists with Name " + getSpName());
}
}
diff --git
a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index a529206..2bff6f1 100755
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -4786,7 +4786,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
}
if(vpcOff && nsOff) {
if(!(spDescription.equalsIgnoreCase("A NetScalerVPX is
dedicated per network.") || spDescription.contains("dedicated NetScaler"))) {
- throw new InvalidParameterValueException("Only NetScaler
Service Pacakge with Dedicated Device Mode is Supported in VPC Type Guest
Network");
+ throw new InvalidParameterValueException("Only NetScaler
Service Package with Dedicated Device Mode is Supported in VPC Type Guest
Network");
}
}
}
