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

Upgrade to fog-google 1.5.0 #64

Merged
merged 4 commits into from
Jun 18, 2018
Merged

Upgrade to fog-google 1.5.0 #64

merged 4 commits into from
Jun 18, 2018

Conversation

tumido
Copy link
Member

@tumido tumido commented Jun 18, 2018

Upgrade to fog-google >= 1.5.0:

This PR could be used instead of #63

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1591272

@tumido
Copy link
Member Author

tumido commented Jun 18, 2018

@miq-bot add_label refactoring, inventory

@tumido tumido force-pushed the fog-1.5.0 branch 3 times, most recently from 96bf152 to 28bff79 Compare June 18, 2018 13:14
@miq-bot
Copy link
Member

miq-bot commented Jun 18, 2018

Checked commits tumido/manageiq-providers-google@875001a~...af27946 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 0 offenses detected
Everything looks fine. 👍

@bronaghs bronaghs merged commit ba0968c into ManageIQ:master Jun 18, 2018
@bronaghs bronaghs added this to the Sprint 88 Ending Jun 18, 2018 milestone Jun 18, 2018
@chrispy1
Copy link

@miq-bot add_label blocker

simaishi pushed a commit that referenced this pull request Jun 18, 2018
Upgrade to fog-google 1.5.0
(cherry picked from commit ba0968c)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1592504
@simaishi
Copy link
Contributor

Gaprindashvili backport details:

$ git log -1
commit 622fbf20352f93e1fc14264d4a6c18481a65cba4
Author: Bronagh Sorota <[email protected]>
Date:   Mon Jun 18 10:16:27 2018 -0400

    Merge pull request #64 from tumido/fog-1.5.0
    
    Upgrade to fog-google 1.5.0
    (cherry picked from commit ba0968c09332b35445d4115a514c461f0ef52702)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1592504

@tumido
Copy link
Member Author

tumido commented Jul 26, 2018

@miq-bot add_label fine/yes

as recommended in BUG 1596336

@simaishi
Copy link
Contributor

@tumido Does this PR require #54?

As is, I will only backport this PR as this PR doesn't list dependencies and #54 doesn't fix a blocker BZ. But that will backport #54 partially, so I just want to make sure that won't cause a problem.

@tumido
Copy link
Member Author

tumido commented Aug 15, 2018

Hi @simaishi! I'm afraid it does. In the time this PR was opened, the #54 was already in master, therefore it's not listed as dependency. The #54 has to be backported to fix the issue https://bugzilla.redhat.com/show_bug.cgi?id=1592216 and it's duplicates. So backporting both is the key probably (both are labeled fine/yes).

@simaishi
Copy link
Contributor

Marking as fine/conflict as the dependent PR #54 conflicts on cherry-pick.

@tumido
Copy link
Member Author

tumido commented Aug 31, 2018

@simaishi there will be a conflict on cherry-pick since in Fine there's no manageiq-providers-google.gemspec. This has to be moved into Gemfile. Would you like me to prepare a separate PR?

@simaishi
Copy link
Contributor

@tumido yes, please.

@simaishi
Copy link
Contributor

Backported to Fine via ManageIQ/manageiq#17936

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.

5 participants