Merge branch '4.17'

Author: DaanHoogland

agent/src/main/java/com/cloud/agent/Agent.java

@@ -457,7 +457,7 @@ public void sendStartup(final Link link) {
             try {
                 link.send(request.toBytes());
             } catch (final ClosedChannelException e) {
-                s_logger.warn("Unable to send reques: " + request.toString());
+                s_logger.warn("Unable to send request: " + request.toString());
             }
         }
     }
@@ -467,7 +467,7 @@ protected void setupStartupCommand(final StartupCommand startup) {
         try {
             addr = InetAddress.getLocalHost();
         } catch (final UnknownHostException e) {
-            s_logger.warn("unknow host? ", e);
+            s_logger.warn("unknown host? ", e);
             throw new CloudRuntimeException("Cannot get local IP address");
         }
 
@@ -954,7 +954,7 @@ private void postRequest(final Request request) throws AgentControlChannelExcept
             try {
                 _link.send(request.toBytes());
             } catch (final ClosedChannelException e) {
-                s_logger.warn("Unable to post agent control reques: " + request.toString());
+                s_logger.warn("Unable to post agent control request: " + request.toString());
                 throw new AgentControlChannelException("Unable to post agent control request due to " + e.getMessage());
             }
         } else {

agent/src/main/java/com/cloud/agent/AgentShell.java

@@ -362,7 +362,7 @@ public void init(String[] args) throws ConfigurationException {
 
             s_logger.info("Agent started");
         } else {
-            s_logger.error("Could not start the Agent because the absolut path of the \"log4j-cloud.xml\" file cannot be determined.");
+            s_logger.error("Could not start the Agent because the absolute path of the \"log4j-cloud.xml\" file cannot be determined.");
         }
 
         final Class<?> c = this.getClass();

api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java

@@ -521,7 +521,7 @@ OVFFile getFileDefinitionFromDiskDefinition(String fileRef, List<OVFFile> files)
     public List<OVFNetworkTO> getNetPrerequisitesFromDocument(Document doc) throws InternalErrorException {
         if (doc == null) {
             if (s_logger.isTraceEnabled()) {
-                s_logger.trace("no document to parse; returning no prerequiste networks");
+                s_logger.trace("no document to parse; returning no prerequisite networks");
             }
             return Collections.emptyList();
         }

api/src/main/java/com/cloud/network/lb/LoadBalancingRulesService.java

@@ -65,7 +65,7 @@ LoadBalancer createPublicLoadBalancerRule(String xId, String name, String descri
      * @param cmd
      *            the command specifying the stickiness method name, params (name,value pairs), policy name and
      *            description.
-     * @return the newly created stickiness policy if successfull, null otherwise
+     * @return the newly created stickiness policy if successful, null otherwise
      * @thows NetworkRuleConflictException
      */
     public StickinessPolicy createLBStickinessPolicy(CreateLBStickinessPolicyCmd cmd) throws NetworkRuleConflictException;
@@ -81,7 +81,7 @@ LoadBalancer createPublicLoadBalancerRule(String xId, String name, String descri
      * @param cmd
      *            the command specifying the stickiness method name, params
      *            (name,value pairs), policy name and description.
-     * @return the newly created stickiness policy if successfull, null
+     * @return the newly created stickiness policy if successful, null
      *         otherwise
      * @thows NetworkRuleConflictException
      */

api/src/main/java/com/cloud/storage/Volume.java

@@ -56,7 +56,7 @@ enum State {
         NotUploaded("The volume entry is just created in DB, not yet uploaded"),
         UploadInProgress("Volume upload is in progress"),
         UploadError("Volume upload encountered some error"),
-        UploadAbandoned("Volume upload is abandoned since the upload was never initiated within a specificed time"),
+        UploadAbandoned("Volume upload is abandoned since the upload was never initiated within a specified time"),
         Attaching("The volume is attaching to a VM from Ready state.");
 
         String _description;

api/src/main/java/com/cloud/vm/UserVmService.java

@@ -502,7 +502,7 @@ UserVm upgradeVirtualMachine(ScaleVMCmd cmd) throws ResourceUnavailableException
     String getVmUserData(long vmId);
 
     /**
-     * determin whether the uservm should be visible to the end user
+     * determine whether the uservm should be visible to the end user
      * @return  value of the display flag
      */
     public boolean isDisplayResourceEnabled(Long vmId);

api/src/main/java/org/apache/cloudstack/api/command/admin/address/ReleasePodIpCmdByAdmin.java

@@ -69,7 +69,7 @@ public void execute() {
         boolean result = _networkService.releasePodIp(this);
         if (result) {
             SuccessResponse response = new SuccessResponse(getCommandName());
-            response.setDisplayText("IP is released sucessfully");
+            response.setDisplayText("IP is released successfully");
             setResponseObject(response);
         } else {
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to release  Pod ip ");

api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java

@@ -64,7 +64,7 @@ public class CreateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
 
     @Parameter(name = ApiConstants.VLAN,
                type = CommandType.INTEGER,
-               description = "Optional. The vlan the ip range sits on, default to Null when it is not specificed which means you network is not on any Vlan. This is mainly for Vmware as other hypervisors can directly reterive bridge from pyhsical network traffic type table")
+               description = "Optional. The vlan the ip range sits on, default to Null when it is not specified which means you network is not on any Vlan. This is mainly for Vmware as other hypervisors can directly reterive bridge from pyhsical network traffic type table")
     private Integer vlan;
 
     @Parameter(name = ApiConstants.NETMASK, type = CommandType.STRING, required = true, description = "the netmask for storage network")

api/src/main/java/org/apache/cloudstack/api/command/user/account/AddUserToProjectCmd.java

@@ -126,7 +126,7 @@ public void execute()  {
 
     private void validateInput() {
         if (email == null && username == null) {
-            throw new InvalidParameterValueException("Must specify atleast username");
+            throw new InvalidParameterValueException("Must specify at least username");
         }
         if (email != null && username == null) {
             throw new InvalidParameterValueException("Must specify username for given email ID");

api/src/main/java/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java

@@ -37,7 +37,7 @@ public class QueryAsyncJobResultCmd extends BaseCmd {
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
 
-    @Parameter(name = ApiConstants.JOB_ID, type = CommandType.UUID, entityType = AsyncJobResponse.class, required = true, description = "the ID of the asychronous job")
+    @Parameter(name = ApiConstants.JOB_ID, type = CommandType.UUID, entityType = AsyncJobResponse.class, required = true, description = "the ID of the asynchronous job")
     private Long id;
 
     /////////////////////////////////////////////////////