summaryrefslogtreecommitdiffstats
path: root/nova/openstack
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-05-23 02:55:35 +0000
committerGerrit Code Review <review@openstack.org>2012-05-23 02:55:35 +0000
commit82f38e44ae5504bc56e05446266912cb700a329e (patch)
tree3cc59f41282295fa01ac6a22318abc702d419000 /nova/openstack
parent94372203cf7fc41245b5b0cb4eb935a80e2d8c20 (diff)
parentf8437e37d4961c6f0cf7be091d919f49268ded1d (diff)
downloadnova-82f38e44ae5504bc56e05446266912cb700a329e.tar.gz
nova-82f38e44ae5504bc56e05446266912cb700a329e.tar.xz
nova-82f38e44ae5504bc56e05446266912cb700a329e.zip
Merge "Enable checking for imports in alphabetical order"
Diffstat (limited to 'nova/openstack')
-rw-r--r--nova/openstack/common/cfg.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/openstack/common/cfg.py b/nova/openstack/common/cfg.py
index 1a167681c..153880f3b 100644
--- a/nova/openstack/common/cfg.py
+++ b/nova/openstack/common/cfg.py
@@ -226,8 +226,8 @@ log files:
import collections
import copy
-import glob
import functools
+import glob
import optparse
import os
import string