diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-21 22:06:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-21 22:06:14 +0000 |
| commit | 0ad5b13b5a5aeffcf12dd6c37afc99857b7012dd (patch) | |
| tree | 06b35e2b9be1434dd5cfe4f07985df2c9b2e8da8 | |
| parent | 7ce11fb25f6b1e55bc479691aad45867b98044b9 (diff) | |
| parent | 493b87b6fcfd3bea09a889ef47b53e0d48a4c125 (diff) | |
| download | ironic-0ad5b13b5a5aeffcf12dd6c37afc99857b7012dd.tar.gz | |
Merge "Removes redundant "to""
| -rw-r--r-- | etc/ironic/ironic.conf.sample | 4 | ||||
| -rw-r--r-- | ironic/drivers/modules/ilo/management.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 629baf584..cc651034d 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -1177,7 +1177,7 @@ #clean_priority_reset_secure_boot_keys_to_default=20 # Priority for clear_secure_boot_keys clean step. This step is -# not enabled by default. It can be enabled to to clear all +# not enabled by default. It can be enabled to clear all # secure boot keys enrolled with iLO. (integer value) #clean_priority_clear_secure_boot_keys=0 @@ -1829,7 +1829,7 @@ # the TTL are automatically deleted. The parameter affects # only reply and fanout queues. (integer value) # Minimum value: 1 -#rabbit_transient_queues_ttl=600 +#rabbit_transient_queues_ttl=1800 # Specifies the number of messages to prefetch. Setting to # zero allows unlimited messages. (integer value) diff --git a/ironic/drivers/modules/ilo/management.py b/ironic/drivers/modules/ilo/management.py index d7863441b..8e5abdc1a 100644 --- a/ironic/drivers/modules/ilo/management.py +++ b/ironic/drivers/modules/ilo/management.py @@ -61,7 +61,7 @@ clean_step_opts = [ default=0, help=_('Priority for clear_secure_boot_keys clean step. This ' 'step is not enabled by default. It can be enabled to ' - 'to clear all secure boot keys enrolled with iLO.')), + 'clear all secure boot keys enrolled with iLO.')), cfg.IntOpt('clean_priority_reset_ilo_credential', default=30, help=_('Priority for reset_ilo_credential clean step. This ' |