Merge "Support hacking>=6.0.0"
This commit is contained in:
commit
f67655291a
@ -750,7 +750,7 @@ class ISCSIConnector(base.BaseLinuxConnector, base_iscsi.BaseISCSIConnector):
|
||||
if not mpath and found:
|
||||
mpath = self._linuxscsi.find_sysfs_multipath_dm(found)
|
||||
# We have the wwn but not a multipath
|
||||
if wwn and not(mpath or wwn_added):
|
||||
if wwn and not (mpath or wwn_added):
|
||||
# Tell multipathd that this wwn is a multipath and hint
|
||||
# multipathd to recheck all the devices we have just
|
||||
# connected. We only do this once, since for any new
|
||||
|
@ -2,7 +2,7 @@
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
|
||||
hacking>=5.0.0,<5.1.0 # Apache-2.0
|
||||
hacking>=6.0.0,<6.1.0 # Apache-2.0
|
||||
flake8-import-order # LGPLv3
|
||||
flake8-logging-format>=0.6.0 # Apache-2.0
|
||||
coverage>=5.5 # Apache-2.0
|
||||
@ -13,7 +13,6 @@ testtools>=2.4.0 # MIT
|
||||
stestr>=3.2.1 # Apache-2.0
|
||||
oslo.vmware>=4.0.0 # Apache-2.0
|
||||
castellan>=3.10.0 # Apache-2.0
|
||||
pycodestyle==2.8.0 # MIT
|
||||
doc8>=0.8.1 # Apache-2.0
|
||||
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||
bandit>=1.7.0,<1.8.0 # Apache-2.0
|
||||
|
Loading…
Reference in New Issue
Block a user