From 35f3bc56dbd6032c91612419fedee67dfb3c4104 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Tue, 17 Sep 2013 17:40:58 +0200 Subject: [PATCH] Fix old import paths Some imports weren't changed in the previous patch. This patch fixes those imports. Implements blueprint change-marconi-structure Change-Id: Ib7fc0d0d2067d816d30c7c4c9b0f590cb72010f5 --- marconi/cmd/gc.py | 2 +- marconi/cmd/server.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/marconi/cmd/gc.py b/marconi/cmd/gc.py index d961c34ad..92f4e4633 100644 --- a/marconi/cmd/gc.py +++ b/marconi/cmd/gc.py @@ -18,10 +18,10 @@ import random import sys import time -from marconi import bootstrap from marconi.common import cli from marconi.common import config from marconi.openstack.common import log as logging +from marconi.queues import bootstrap PROJECT_CFG = config.project('marconi') LOG = logging.getLogger(__name__) diff --git a/marconi/cmd/server.py b/marconi/cmd/server.py index ffe0dbfef..3143e0544 100644 --- a/marconi/cmd/server.py +++ b/marconi/cmd/server.py @@ -15,8 +15,8 @@ import sys -from marconi import bootstrap from marconi.common import cli +from marconi.queues import bootstrap @cli.runnable