--- a/components/python/oslo.messaging/oslo.messaging-PYVER.p5m	Fri Feb 05 11:09:10 2016 -0800
+++ b/components/python/oslo.messaging/oslo.messaging-PYVER.p5m	Fri Feb 05 17:54:17 2016 -0500
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -45,59 +45,24 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/namespace_packages.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_cmd/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_cmd/zmq_receiver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/amqp.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/amqpdriver.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/base.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/common.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/impl_fake.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/impl_qpid.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/impl_rabbit.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/impl_zmq.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/matchmaker.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/matchmaker_redis.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/matchmaker_ring.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/pool.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/protocols/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/protocols/amqp/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/protocols/amqp/controller.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/protocols/amqp/driver.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/protocols/amqp/eventloop.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_executors/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_executors/base.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_executors/impl_blocking.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_executors/impl_eventlet.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/conffixture.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/localcontext.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/_impl_log.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/_impl_messaging.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/_impl_noop.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/_impl_routing.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/_impl_test.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/dispatcher.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/listener.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/log_handler.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/logger.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/middleware.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/notifier.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/openstack/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/openstack/common/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/openstack/common/context.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/openstack/common/gettextutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/openstack/common/importutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/openstack/common/jsonutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/openstack/common/middleware/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/openstack/common/middleware/base.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/openstack/common/strutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/openstack/common/timeutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/opts.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/rpc/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/rpc/client.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/rpc/dispatcher.py
@@ -106,42 +71,101 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/server.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/target.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/transport.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_cmd/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_cmd/zmq_receiver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/amqp.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/amqpdriver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/common.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/impl_fake.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/impl_qpid.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/impl_rabbit.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/impl_zmq.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/matchmaker.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/matchmaker_redis.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/matchmaker_ring.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/pool.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/protocols/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/protocols/amqp/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/protocols/amqp/controller.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/protocols/amqp/driver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/protocols/amqp/eventloop.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/protocols/amqp/opts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_executors/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_executors/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_executors/impl_aioeventlet.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_executors/impl_blocking.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_executors/impl_eventlet.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_executors/impl_thread.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_i18n.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/conffixture.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/localcontext.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/_impl_log.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/_impl_messaging.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/_impl_noop.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/_impl_routing.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/_impl_test.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/dispatcher.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/filter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/listener.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/log_handler.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/logger.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/middleware.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/notifier.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/openstack/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/openstack/common/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/openstack/common/context.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/opts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/rpc/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/rpc/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/rpc/dispatcher.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/rpc/server.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/serializer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/server.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/target.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/transport.py
 #
-license LICENSE license="Apache v2.0"
-
-# force a group dependency on the optional anyjson; pkgdepend work is needed
-# to flush this out.
-depend type=group fmri=library/python/anyjson-$(PYV)
-
-# force a group dependency on the optional simplejson; pkgdepend work is needed
-# to flush this out.
-depend type=group fmri=library/python/simplejson-$(PYV)
+license oslo.messaging.license license="Apache v2.0"
 
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
-# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/babel-$(PYV)
+# force a dependency on aioeventlet; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/aioeventlet-$(PYV)
+
+# force a dependency on futures; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/futures-$(PYV)
 
 # force a dependency on greenlet; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/greenlet-$(PYV)
 
-# force a dependency on iso8601; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/iso8601-$(PYV)
-
 # force a dependency on kombu; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/kombu-$(PYV)
 
+# force a dependency on oslo.i18n; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.i18n-$(PYV)
+
 # force a dependency on the oslo.messaging package
 depend type=require \
     fmri=library/python/oslo.messaging@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
+# force a dependency on oslo.middleware; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.middleware-$(PYV)
+
+# force a dependency on oslo.serialization; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.serialization-$(PYV)
+
 # force a dependency on oslo.utils; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/oslo.utils-$(PYV)
 
-# force a dependency on pyyaml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/pyyaml-$(PYV)
+# force a dependency on pbr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pbr-$(PYV)
 
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-$(PYV)
@@ -149,5 +173,8 @@
 # force a dependency on stevedore; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/stevedore-$(PYV)
 
+# force a dependency on trollius; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/trollius-$(PYV)
+
 # force a dependency on webob; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/webob-$(PYV)