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

Removing Eo time patch #19165

Merged
merged 1 commit into from
Aug 19, 2019
Merged

Removing Eo time patch #19165

merged 1 commit into from
Aug 19, 2019

Conversation

d-m-u
Copy link
Contributor

@d-m-u d-m-u commented Aug 19, 2019

Rufus got upgraded to 3.6! We still needed monkeypatch though for ==.

#19153 got in on Friday and we had to patch EoTime == but the owner of Rufus is great and put up floraison/et-orbi@283f5e2 so we don't need this now.

see #19153 (comment)

@d-m-u d-m-u force-pushed the removing_eo_time_patch branch from 3e54241 to 85a05ed Compare August 19, 2019 10:49
@d-m-u
Copy link
Contributor Author

d-m-u commented Aug 19, 2019

@miq-bot add_label dependencies, technical debt

@d-m-u d-m-u changed the title [WIP] Removing eo time patch Removing eo time patch Aug 19, 2019
@d-m-u
Copy link
Contributor Author

d-m-u commented Aug 19, 2019

@miq-bot assign @bdunne

@d-m-u
Copy link
Contributor Author

d-m-u commented Aug 19, 2019

Per #19153 (comment) I'd like this to be backported as well if that's okay with The Powers That Be. I mean @dmetzger57
@miq-bot add_label ivanchuk/yes

@d-m-u
Copy link
Contributor Author

d-m-u commented Aug 19, 2019

@d-m-u d-m-u changed the title Removing eo time patch Removing Eo time patch Aug 19, 2019
@miq-bot miq-bot changed the title Removing Eo time patch [WIP] Removing Eo time patch Aug 19, 2019
@miq-bot miq-bot added the wip label Aug 19, 2019
@d-m-u d-m-u closed this Aug 19, 2019
@d-m-u d-m-u reopened this Aug 19, 2019
Gemfile Show resolved Hide resolved
@d-m-u d-m-u changed the title [WIP] Removing Eo time patch Removing Eo time patch Aug 19, 2019
@miq-bot
Copy link
Member

miq-bot commented Aug 19, 2019

@d-m-u unrecognized command 'remove', ignoring...

Accepted commands are: add_label, add_reviewer, assign, close_issue, move_issue, remove_label, rm_label, remove_reviewer, set_milestone

@d-m-u
Copy link
Contributor Author

d-m-u commented Aug 19, 2019

@miq-bot remove_label wip

@miq-bot miq-bot removed the wip label Aug 19, 2019
@d-m-u d-m-u force-pushed the removing_eo_time_patch branch from 85a05ed to 4f55113 Compare August 19, 2019 15:28
@d-m-u d-m-u force-pushed the removing_eo_time_patch branch from 4f55113 to f521d9f Compare August 19, 2019 15:46
Copy link
Member

@bdunne bdunne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 LGTM

@miq-bot
Copy link
Member

miq-bot commented Aug 19, 2019

Checked commit d-m-u@f521d9f with ruby 2.4.6, rubocop 0.69.0, haml-lint 0.20.0, and yamllint 1.10.0
1 file checked, 1 offense detected

Gemfile

@bdunne bdunne merged commit cd7ab37 into ManageIQ:master Aug 19, 2019
@bdunne bdunne added this to the Sprint 118 Ending Aug 19, 2019 milestone Aug 19, 2019
simaishi pushed a commit that referenced this pull request Aug 19, 2019
@simaishi
Copy link
Contributor

Ivanchuk backport details:

$ git log -1
commit ca65a621b8c20be3775d22e855248e2e7774c073
Author: Brandon Dunne <[email protected]>
Date:   Mon Aug 19 13:44:08 2019 -0400

    Merge pull request #19165 from d-m-u/removing_eo_time_patch
    
    Removing Eo time patch
    
    (cherry picked from commit cd7ab374b8079142572bf260b48dd1772f00b5cd)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1743211

@simaishi
Copy link
Contributor

Due to an issue found, reverted the ivanchuk backport (discussed with @d-m-u)

commit cebb18209e955c97d19b35047e15b2e421ad695e
Author: Satoe Imaishi <[email protected]>
Date:   Wed Aug 21 15:53:04 2019 -0400

    Revert "Merge pull request #19165 from d-m-u/removing_eo_time_patch"
    
    This reverts commit ca65a621b8c20be3775d22e855248e2e7774c073.

@simaishi
Copy link
Contributor

Ivanchuk backport details:

$ git log -1
commit 6e62a4d1787345d2f0227fabbd1d8b24348d6218
Author: Brandon Dunne <[email protected]>
Date:   Mon Aug 19 13:44:08 2019 -0400

    Merge pull request #19165 from d-m-u/removing_eo_time_patch
    
    Removing Eo time patch
    
    (cherry picked from commit cd7ab374b8079142572bf260b48dd1772f00b5cd)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1743211

@d-m-u d-m-u deleted the removing_eo_time_patch branch September 26, 2019 10:49
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.

4 participants