Skip to content
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

Merged
merged 1 commit into from
Sep 24, 2021
Merged

Conversation

agrare
Copy link
Member

@agrare agrare commented Sep 23, 2021

Bump rbvmomi2 to v3.1.0 to pull in support for vSphere 7.0U2

Fixes #747

Bump rbvmomi2 to v3.1.0 to pull in support for vSphere 7.0U2
@miq-bot
Copy link
Member

miq-bot commented Sep 23, 2021

Checked commit agrare@c508fc0 with ruby 2.6.3, rubocop 1.13.0, haml-lint 0.35.0, and yamllint
0 files checked, 0 offenses detected
Everything looks fine. 🍪

@Fryguy Fryguy merged commit af40a03 into ManageIQ:master Sep 24, 2021
@Fryguy
Copy link
Member

Fryguy commented Sep 24, 2021

@agrare A conflict occurred during the backport of this pull request to morphy.

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 morphy branch in order to resolve this.

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"

@Fryguy
Copy link
Member

Fryguy commented Sep 24, 2021

I'll just handle this one directly.

@agrare agrare deleted the add_support_7_0_U2 branch September 24, 2021 13:18
@agrare
Copy link
Member Author

agrare commented Sep 24, 2021

Yeah surprised this conflicted after we fixed the previous one

Fryguy added a commit that referenced this pull request Sep 24, 2021
Add support for vSphere 7.0U2

(cherry picked from commit af40a03)
@Fryguy
Copy link
Member

Fryguy commented Sep 24, 2021

Backported to morphy

commit 5c0e0c2d0a2b5ab35aa14330545e29a45b038269 (HEAD -> morphy, upstream/morphy)
Author: Jason Frey <[email protected]>
Date:   Fri Sep 24 09:17:37 2021 -0400

    Merge pull request #749 from agrare/add_support_7_0_U2

    Add support for vSphere 7.0U2

    (cherry picked from commit af40a03de2441c78d0db77cc061496f0e6006b1a)

@miq-bot
Copy link
Member

miq-bot commented Sep 29, 2021

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

VMWare provider does not work in Kasparov 2
3 participants