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

Don't pass nil ssl_options to try_connection #166

Merged

Conversation

mansam
Copy link
Contributor

@mansam mansam commented Nov 28, 2017

Should fix the bug reported in https://bugzilla.redhat.com/show_bug.cgi?id=1518182 by ensuring that ssl_options is always a hash when it gets passed into try_connection, so that the attempt to merge it doesn't fail.

@miq-bot
Copy link
Member

miq-bot commented Nov 28, 2017

Checked commit mansam@d7b4a90 with ruby 2.3.3, rubocop 0.47.1, haml-lint 0.20.0, and yamllint 1.10.0
1 file checked, 0 offenses detected
Everything looks fine. 🍪

@aufi aufi merged commit da96f85 into ManageIQ:master Nov 28, 2017
@aufi aufi added this to the Sprint 75 Ending Dec 11, 2017 milestone Nov 28, 2017
simaishi pushed a commit that referenced this pull request Nov 28, 2017
…connection

Don't pass nil ssl_options to try_connection
(cherry picked from commit da96f85)

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

Gaprindashvili backport details:

$ git log -1
commit 43a69c5aaf571061ffc513f2f796c694a1d039e5
Author: Marek Aufart <[email protected]>
Date:   Tue Nov 28 16:11:02 2017 +0100

    Merge pull request #166 from mansam/dont-pass-nil-ssl-options-to-try_connection
    
    Don't pass nil ssl_options to try_connection
    (cherry picked from commit da96f85b0f2cba9c791f259befd0fff139facc4a)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1518338

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