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

[shard_seed] fix default_sources for linux, darwin and windows #1379

Merged
merged 1 commit into from
Jun 22, 2019

Conversation

michel-slm
Copy link
Contributor

@michel-slm michel-slm commented Jun 21, 2019

Description

collect_os now returns a string (see mixin/os.rb), but the shard plugin still assumed it returns a symbol, so no matter the OS, unless overridden in client.rb this plugin will only use the machine name as the shard source.

Signed-off-by: Michel Salim michel@fb.com

Related Issue

#1378

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Chore (non-breaking change that does not add functionality or fix an issue)

Checklist:

  • I have read the CONTRIBUTING document.
  • I have run the pre-merge tests locally and they pass.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • All commits have been signed-off for the Developer Certificate of Origin.

This change is Reviewable

`collect_os` now returns a string (see `mixin/os.rb`), but the shard plugin still assumed it returns a symbol, so no matter the OS, unless overridden in `client.rb` this plugin will only use the machine name as the shard source.

Signed-off-by: Michel Salim <michel@fb.com>
@tas50 tas50 merged commit 6e643b2 into chef:master Jun 22, 2019
@michel-slm michel-slm deleted the fix-shard-on-mac branch June 22, 2019 14:50
@lock
Copy link

lock bot commented Aug 21, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Aug 21, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants