| commit | dccaf684bc9e02ce26ec0f2a7dad02f740ad4c46 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Thu Jan 08 12:40:14 2015 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Thu Jan 08 12:40:14 2015 +0000 |
| tree | 5152f3ee621e65b45bfe0433a1cd154967c26573 | |
| parent | cd3622e3e2dd815db08cb2b0543bc9c0f51d2dfb [diff] | |
| parent | c6b2562ce6edcc15fa47a29288cf95ffee5258d9 [diff] |
Merge "Cleanup heat/openstack/common"
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