Merge "Fake out sleeps in unit tests"
authorJenkins <jenkins@review.openstack.org>
Sun, 3 May 2015 22:46:49 +0000 (22:46 +0000)
committerGerrit Code Review <review@openstack.org>
Sun, 3 May 2015 22:46:49 +0000 (22:46 +0000)

Trivial merge