-
Notifications
You must be signed in to change notification settings - Fork 69
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support for vSphere 7.0U2 #749
Conversation
Bump rbvmomi2 to v3.1.0 to pull in support for vSphere 7.0U2
Checked commit agrare@c508fc0 with ruby 2.6.3, rubocop 1.13.0, haml-lint 0.35.0, and yamllint |
@agrare A conflict occurred during the backport of this pull request to If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the Conflict details: diff --cc manageiq-providers-vmware.gemspec
index eb02a339,ede33169..00000000
--- a/manageiq-providers-vmware.gemspec
+++ b/manageiq-providers-vmware.gemspec
@@@ -20,8 -20,8 +20,13 @@@ Gem::Specification.new do |spec
spec.add_dependency "fog-vcloud-director", "~> 0.3.0"
spec.add_dependency "ffi-vix_disk_lib", "~>1.1"
++<<<<<<< HEAD
+ spec.add_dependency "rbvmomi2", "~>3.0"
+ spec.add_dependency "vmware_web_service", "~>2.1.0"
++=======
+ spec.add_dependency "rbvmomi2", "~>3.1"
+ spec.add_dependency "vmware_web_service", "~>3.0"
++>>>>>>> af40a03d... Merge pull request #749 from agrare/add_support_7_0_U2
spec.add_dependency "vsphere-automation-sdk", "~>0.4.7"
spec.add_development_dependency "manageiq-style" |
I'll just handle this one directly. |
Yeah surprised this conflicted after we fixed the previous one |
Add support for vSphere 7.0U2 (cherry picked from commit af40a03)
Backported to
|
This pull request has been mentioned on ManageIQ Forum. There might be relevant details there: https://talk.manageiq.org/t/vmware-provider-does-not-work-in-kasparov-2/5514/2 |
Bump rbvmomi2 to v3.1.0 to pull in support for vSphere 7.0U2
Fixes #747