Browse code

Merge "Updated Typos in devstack"

Jenkins authored on 2015/11/23 16:29:43
Showing 5 changed files
... ...
@@ -328,7 +328,7 @@ There are some broad criteria that will be followed when reviewing
328 328
 your change
329 329
 
330 330
 * **Is it passing tests** -- your change will not be reviewed
331
-  throughly unless the official CI has run successfully against it.
331
+  thoroughly unless the official CI has run successfully against it.
332 332
 
333 333
 * **Does this belong in DevStack** -- DevStack reviewers have a
334 334
   default position of "no" but are ready to be convinced by your
... ...
@@ -46,7 +46,7 @@ ZOOKEEPER_CONF_DIR=/etc/zookeeper
46 46
 # - cleanup_dlm
47 47
 
48 48
 # This should be declared in the settings file of any plugin or
49
-# service that needs to have a dlm in their enviroment.
49
+# service that needs to have a dlm in their environment.
50 50
 function use_dlm {
51 51
     enable_service $(dlm_backend)
52 52
 }
... ...
@@ -92,7 +92,7 @@ IRONIC_VM_LOG_DIR=${IRONIC_VM_LOG_DIR:-$IRONIC_DATA_DIR/logs/}
92 92
 # Use DIB to create deploy ramdisk and kernel.
93 93
 IRONIC_BUILD_DEPLOY_RAMDISK=$(trueorfalse True IRONIC_BUILD_DEPLOY_RAMDISK)
94 94
 # If not use DIB, these files are used as deploy ramdisk/kernel.
95
-# (The value must be a absolute path)
95
+# (The value must be an absolute path)
96 96
 IRONIC_DEPLOY_RAMDISK=${IRONIC_DEPLOY_RAMDISK:-}
97 97
 IRONIC_DEPLOY_KERNEL=${IRONIC_DEPLOY_KERNEL:-}
98 98
 IRONIC_DEPLOY_ELEMENT=${IRONIC_DEPLOY_ELEMENT:-deploy-ironic}
... ...
@@ -672,7 +672,7 @@ function configure_iptables {
672 672
     # enable tftp natting for allowing connections to HOST_IP's tftp server
673 673
     sudo modprobe nf_conntrack_tftp
674 674
     sudo modprobe nf_nat_tftp
675
-    # explicitly allow DHCP - packets are occassionally being dropped here
675
+    # explicitly allow DHCP - packets are occasionally being dropped here
676 676
     sudo iptables -I INPUT -p udp --dport 67:68 --sport 67:68 -j ACCEPT || true
677 677
     # nodes boot from TFTP and callback to the API server listening on $HOST_IP
678 678
     sudo iptables -I INPUT -d $HOST_IP -p udp --dport 69 -j ACCEPT || true
... ...
@@ -24,7 +24,7 @@ function check_result {
24 24
 }
25 25
 
26 26
 # mock function-common:die so that it does not
27
-# interupt our test script
27
+# interrupt our test script
28 28
 function die {
29 29
     exit -1
30 30
 }
... ...
@@ -46,7 +46,7 @@ function failed {
46 46
     ERROR=$((ERROR+1))
47 47
 }
48 48
 
49
-# assert string comparision of val1 equal val2, printing out msg
49
+# assert string comparison of val1 equal val2, printing out msg
50 50
 #  usage: assert_equal val1 val2 msg
51 51
 function assert_equal {
52 52
     local lineno