Updated openstack/openstack
Project: openstack/tempest  c6c5d1758dbb173bcaee4c15989cbc5eae67f931
null
remove a spurious wait that could get us into trouble

it's not really clear that this wait is useful for anything
except generating bugs when we've done terible things to the
image during this test. Removing it as unneeded.

Change-Id: I88546bf3845d8e62d4baf5572f0403c0eaa983ba
Closes-Bug: #1229890
Updated openstack/openstack
Project: openstack-dev/devstack  998cc16a8d8be65725c328aff97b8f4d4f0708a8
null
Handle the case of pipe char in value for iniset

iniset did not handle the case of "|" in the value
to be injected. Fix this by replacing | with \000 (NULL).

Fixes bug #1258050

Change-Id: I8882c2f3f177ebdfa0c66270dbbc7fd50f30b065