Merge branch 'master' into 1.5

This commit is contained in:
Julien Duponchelle committed 2016-02-16 19:07:17 +01:00
commit 9b1d513b03
3 files changed
+10 -2

No files matched your search

+1 -1
View File
@@ -398,7 +398,7 @@ class VMware(BaseManager):
break
if vmlist_entry is not None:
for name in inventory_pairs.keys():
for name in inventory_pairs.copy().keys():
if name.startswith(vmlist_entry):
del inventory_pairs[name]