cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] marcaurele closed pull request #2359: doc: replace virutal by virtual (typo)
Date Thu, 01 Jan 1970 00:00:00 GMT
marcaurele closed pull request #2359: doc: replace virutal by virtual (typo)
URL: https://github.com/apache/cloudstack/pull/2359
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/api/src/com/cloud/network/vpc/VpcOffering.java b/api/src/com/cloud/network/vpc/VpcOffering.java
index fb4b151fb4c..c0da6bf967a 100644
--- a/api/src/com/cloud/network/vpc/VpcOffering.java
+++ b/api/src/com/cloud/network/vpc/VpcOffering.java
@@ -52,7 +52,7 @@
     boolean isDefault();
 
     /**
-     * @return service offering id used by VPC virutal router
+     * @return service offering id used by VPC virtual router
      */
     Long getServiceOfferingId();
 
diff --git a/api/src/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java b/api/src/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java
index 70cbd7ffe05..a74c95780d1 100644
--- a/api/src/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java
@@ -96,19 +96,19 @@
  private Boolean isSystem;
 
  @SerializedName(ApiConstants.VIRTUAL_MACHINE_ID)
- @Param(description = "virutal machine id the ip address is assigned to (not null only for
static nat Ip)")
+ @Param(description = "virtual machine id the ip address is assigned to (not null only for
static nat Ip)")
  private String virtualMachineId;
 
  @SerializedName("vmipaddress")
- @Param(description = "virutal machine (dnat) ip address (not null only for static nat Ip)")
+ @Param(description = "virtual machine (dnat) ip address (not null only for static nat Ip)")
  private String virtualMachineIp;
 
  @SerializedName("virtualmachinename")
- @Param(description = "virutal machine name the ip address is assigned to (not null only
for static nat Ip)")
+ @Param(description = "virtual machine name the ip address is assigned to (not null only
for static nat Ip)")
  private String virtualMachineName;
 
  @SerializedName("virtualmachinedisplayname")
- @Param(description = "virutal machine display name the ip address is assigned to (not null
only for static nat Ip)")
+ @Param(description = "virtual machine display name the ip address is assigned to (not null
only for static nat Ip)")
  private String virtualMachineDisplayName;
 
  @SerializedName(ApiConstants.ASSOCIATED_NETWORK_ID)
diff --git a/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java b/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java
index 3c03247eddb..d3d98c87f17 100644
--- a/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java
@@ -96,19 +96,19 @@
     private Boolean isSystem;
 
     @SerializedName(ApiConstants.VIRTUAL_MACHINE_ID)
-    @Param(description = "virutal machine id the ip address is assigned to (not null only
for static nat Ip)")
+    @Param(description = "virtual machine id the ip address is assigned to (not null only
for static nat Ip)")
     private String virtualMachineId;
 
     @SerializedName("vmipaddress")
-    @Param(description = "virutal machine (dnat) ip address (not null only for static nat
Ip)")
+    @Param(description = "virtual machine (dnat) ip address (not null only for static nat
Ip)")
     private String virtualMachineIp;
 
     @SerializedName("virtualmachinename")
-    @Param(description = "virutal machine name the ip address is assigned to (not null only
for static nat Ip)")
+    @Param(description = "virtual machine name the ip address is assigned to (not null only
for static nat Ip)")
     private String virtualMachineName;
 
     @SerializedName("virtualmachinedisplayname")
-    @Param(description = "virutal machine display name the ip address is assigned to (not
null only for static nat Ip)")
+    @Param(description = "virtual machine display name the ip address is assigned to (not
null only for static nat Ip)")
     private String virtualMachineDisplayName;
 
     @SerializedName(ApiConstants.ASSOCIATED_NETWORK_ID)
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index f5365eb71f7..3591e603b0a 100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -765,7 +765,7 @@ private boolean resetVMPasswordInternal(Long vmId, String password) throws
Resou
             // Need to reboot the virtual machine so that the password gets
             // redownloaded from the DomR, and reset on the VM
             if (!result) {
-                s_logger.debug("Failed to reset password for the virutal machine; no need
to reboot the vm");
+                s_logger.debug("Failed to reset password for the virtual machine; no need
to reboot the vm");
                 return false;
             } else {
                 if (vmInstance.getState() == State.Stopped) {
@@ -874,7 +874,7 @@ private boolean resetVMSSHKeyInternal(Long vmId, String sshPublicKey,
String pas
 
         // Need to reboot the virtual machine so that the password gets redownloaded from
the DomR, and reset on the VM
         if (!result) {
-            s_logger.debug("Failed to reset SSH Key for the virutal machine; no need to reboot
the vm");
+            s_logger.debug("Failed to reset SSH Key for the virtual machine; no need to reboot
the vm");
             return false;
         } else {
             if (vmInstance.getState() == State.Stopped) {
diff --git a/test/metadata/func/flatnetwork.xml b/test/metadata/func/flatnetwork.xml
index e5eec995c48..60866537b01 100644
--- a/test/metadata/func/flatnetwork.xml
+++ b/test/metadata/func/flatnetwork.xml
@@ -496,7 +496,7 @@ under the License.
 	<command>
 		<name>destroyVirtualMachine</name>
 		<usercommand>true</usercommand>
-		<testcase>Destroying virutal machine</testcase>
+		<testcase>Destroying virtual machine</testcase>
 		<parameters>
 			<item getparam="true">
 				<name>id</name>
diff --git a/test/metadata/func/roughflatstress.xml b/test/metadata/func/roughflatstress.xml
index 9580212d2c5..841190c496f 100644
--- a/test/metadata/func/roughflatstress.xml
+++ b/test/metadata/func/roughflatstress.xml
@@ -619,7 +619,7 @@ under the License.
 	<command>
 		<name>destroyVirtualMachine</name>
 		<usercommand>true</usercommand>
-		<testcase>Destroying virutal machine</testcase>
+		<testcase>Destroying virtual machine</testcase>
 		<parameters>
 			<item getparam="true">
 				<name>id</name>
@@ -643,7 +643,7 @@ under the License.
 	<command>
 		<name>destroyVirtualMachine</name>
 		<usercommand>true</usercommand>
-		<testcase>Destroying virutal machine</testcase>
+		<testcase>Destroying virtual machine</testcase>
 		<parameters>
 			<item getparam="true">
 				<name>id</name>
diff --git a/test/metadata/func/securitygroups.xml b/test/metadata/func/securitygroups.xml
index 58108fd6213..3ecffbf8467 100644
--- a/test/metadata/func/securitygroups.xml
+++ b/test/metadata/func/securitygroups.xml
@@ -733,7 +733,7 @@ under the License.
 	<command>
 		<name>destroyVirtualMachine</name>
 		<usercommand>true</usercommand>
-		<testcase>Destroying virutal machine</testcase>
+		<testcase>Destroying virtual machine</testcase>
 		<parameters>
 			<item getparam="true">
 				<name>id</name>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message