Updated openstack/openstack
Project: openstack/tempest  2addf1c0b3fb44cddca6d9748a885e68307962dc
null
Add python-swift client to the requirements

Since Id4b27ee70f420f7536b4c698eb1f3bba15dbd1e8 we have swift scenarios tests
which means that we must include swiftclient as a requirement.
Closes-bug: #1265936

Cherry-picked from Iee233867446cce098dbce9e5ab9ab1d4b19d97b3

Change-Id: I6d2ceb62aacb84f183cd8037e5b99cc5666b6f67
Updated openstack/openstack
Project: openstack/nova  3e208e19536a17ad5a16124900261178ed57ea72
null
plug_vif raise NotImplementedError instead of pass

The Hyper-V, VMware, Docker and PowerVM drivers raise
NotImplementedError from the plug_vifs and unplug_vifs
methods rather than pass.
The compute manager handles the NotImplementedError
case when initializing the host.

Fixed bug 1218593

(cherry picked from commit 6ef9262a6aa39b2da8023067386b832a35ecc45c)

Conflicts:

	nova/tests/virt/hyperv/test_hypervapi.py
	nova/tests/virt/vmwareapi/test_vmwareapi.py
Change-Id: Id17a1f691f46816eadfe257d9ac0cc46502318ef