Browse code

Merge "Fix typos on three comments and one message"

Jenkins authored on 2015/11/13 07:06:23
Showing 2 changed files
... ...
@@ -410,7 +410,7 @@ function get_instance_ip {
410 410
     ip=$(echo "$nova_result" | grep "$network_name" | get_field 2)
411 411
     if [[ $ip = "" ]];then
412 412
         echo "$nova_result"
413
-        die $LINENO "[Fail] Coudn't get ipaddress of VM"
413
+        die $LINENO "[Fail] Couldn't get ipaddress of VM"
414 414
     fi
415 415
     echo $ip
416 416
 }
... ...
@@ -1036,7 +1036,7 @@ function _parse_package_files {
1036 1036
                 # We are using BASH regexp matching feature.
1037 1037
                 package=${BASH_REMATCH[1]}
1038 1038
                 distros=${BASH_REMATCH[2]}
1039
-                # In bash ${VAR,,} will lowecase VAR
1039
+                # In bash ${VAR,,} will lowercase VAR
1040 1040
                 # Look for a match in the distro list
1041 1041
                 if [[ ! ${distros,,} =~ ${DISTRO,,} ]]; then
1042 1042
                     # If no match then skip this package
... ...
@@ -1507,7 +1507,7 @@ function stop_process {
1507 1507
                 # this fixed in all services:
1508 1508
                 # https://bugs.launchpad.net/oslo-incubator/+bug/1446583
1509 1509
                 sleep 1
1510
-                # /bin/true becakse pkill on a non existant process returns an error
1510
+                # /bin/true because pkill on a non existent process returns an error
1511 1511
                 pkill -g $(cat $SERVICE_DIR/$SCREEN_NAME/$service.pid) || /bin/true
1512 1512
             fi
1513 1513
             rm $SERVICE_DIR/$SCREEN_NAME/$service.pid
... ...
@@ -1715,7 +1715,7 @@ function plugin_override_defaults {
1715 1715
         if [[ -f $dir/devstack/override-defaults ]]; then
1716 1716
             # be really verbose that an override is happening, as it
1717 1717
             # may not be obvious if things fail later.
1718
-            echo "$plugin has overriden the following defaults"
1718
+            echo "$plugin has overridden the following defaults"
1719 1719
             cat $dir/devstack/override-defaults
1720 1720
             source $dir/devstack/override-defaults
1721 1721
         fi