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 return result of YAML.load if false #1902

Merged
merged 1 commit into from
Aug 18, 2014
Merged

Conversation

jordan0day
Copy link

reference issue 1901

@mperham
Copy link
Collaborator

mperham commented Aug 18, 2014

Test?

@seuros
Copy link
Collaborator

seuros commented Aug 18, 2014

Can you add test, edit the changelog and squash the commits ?

Don't return result of YAML.load if false

added tests around empty config file

update changelog
@jordan0day
Copy link
Author

Added test to verify that empty config file doesn't cause crash, and that sidekiq options (with no config file specified) and options (with an empty config file specified) are identical. Updated changelog under the 3.2.3 header.

seuros added a commit that referenced this pull request Aug 18, 2014
Don't return result of YAML.load if false
@seuros seuros merged commit 95d5998 into sidekiq:master Aug 18, 2014
@seuros
Copy link
Collaborator

seuros commented Aug 18, 2014

Thank you

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

Successfully merging this pull request may close these issues.

None yet

3 participants