Updated openstack/openstack
Project: openstack/cinder  e2df1c82d074b9473aa6e242e048d3c5216c356f
null
Fixed some FCZM unit tests hacking issues

This patch is a follow up to a review that merged
included and had some issues raised after it was merged.
This patch includes some hacking cleanup and some
unit test cleanup for the Fibre Channel Zone Manager.

Change-Id: Ibb6974b2279f08720c2469893245bc888d35899c
Closes-Bug: #1285029
Updated openstack/openstack
Project: openstack/nova  c7ba3919749acbabaaa3ab3bc9ee4a2aa00720f1
null
Make nova-network use conductor for security groups refresh

This makes nova-network use the existing conductor interface for
triggering security groups member refreshes.

Related to blueprint nova-network-objects

Change-Id: Ieca163d67cd005534acb225df83457d755295af9
Related-bug: 1290568