summaryrefslogtreecommitdiff
path: root/trove/conductor
diff options
context:
space:
mode:
authorDoug Hellmann <doug@doughellmann.com>2015-05-06 20:01:57 +0000
committerDoug Hellmann <doug@doughellmann.com>2015-05-06 20:01:57 +0000
commit3ce4756d2c7ad7bec4dec08c158367433823b0c7 (patch)
treeefb76f6211de69bbdccf289fd71ce48688cb4b25 /trove/conductor
parentfce2e356ed0e243d9d4f0d6b9a290128dee6c58a (diff)
downloadtrove-3ce4756d2c7ad7bec4dec08c158367433823b0c7.tar.gz
Drop use of 'oslo' namespace package
The Oslo libraries have moved all of their code out of the 'oslo' namespace package into per-library packages. The namespace package was retained during kilo for backwards compatibility, but will be removed by the liberty-2 milestone. This change removes the use of the namespace package, replacing it with the new package names. The patches in the libraries will be put on hold until application patches have landed, or L2, whichever comes first. At that point, new versions of the libraries without namespace packages will be released as a major version update. Please merge this patch, or an equivalent, before L2 to avoid problems with those library releases. Blueprint: remove-namespace-packages https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages Change-Id: I9d3e80d94795060d375aae30ce249513aae3fd97
Diffstat (limited to 'trove/conductor')
-rw-r--r--trove/conductor/api.py2
-rw-r--r--trove/conductor/manager.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/trove/conductor/api.py b/trove/conductor/api.py
index 63b54f1c..affbf6c0 100644
--- a/trove/conductor/api.py
+++ b/trove/conductor/api.py
@@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from oslo import messaging
+import oslo_messaging as messaging
from trove import rpc
from trove.common import cfg
from trove.common.rpc import version as rpc_version
diff --git a/trove/conductor/manager.py b/trove/conductor/manager.py
index c45d1263..bb38d117 100644
--- a/trove/conductor/manager.py
+++ b/trove/conductor/manager.py
@@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from oslo import messaging
+import oslo_messaging as messaging
from trove.backup import models as bkup_models
from trove.common import cfg