| commit | 907b1cecde0165f21ae3a4dd8cee0ed4b749e67c | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Mon Jan 12 05:34:22 2015 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Mon Jan 12 05:34:22 2015 +0000 |
| tree | d0bf83c3068094c22c9814e974a44e28fc59490c | |
| parent | dccaf684bc9e02ce26ec0f2a7dad02f740ad4c46 [diff] | |
| parent | 4754f4f88771fd6d062c92b89d169468b50c00c6 [diff] |
Merge "Prevent occasional test failures due to duplicate stack names"
diff --git a/common/test.py b/common/test.py index 7478f64..3de44f5 100644 --- a/common/test.py +++ b/common/test.py
@@ -22,8 +22,8 @@ import time from heatclient import exc as heat_exceptions +from oslo.utils import timeutils -from heat.openstack.common import timeutils from heat_integrationtests.common import clients from heat_integrationtests.common import config from heat_integrationtests.common import exceptions