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

(maint) Mergeup 1.6.x: FM-7839, desc/docs cleanup #186

Merged
merged 6 commits into from
Jun 14, 2019

Commits on Jun 12, 2019

  1. Configuration menu
    Copy the full SHA
    8ee1220 View commit details
    Browse the repository at this point in the history
  2. (FM-7839) Implement 'to_json' method for ResourceShim for bolt

    bolt's `get_resources` uses the `libexec/query_resources.rb` to retrieve
    resources as json from the target nodes. Especially https://github.com/puppetlabs/bolt/blob/7dec6e49d66c7f9ae06088d46ee3330de0ed2fed/libexec/query_resources.rb#L71
    causes `ResourceShims` to fail as they did not implement `to_json`.
    
    This integration test models what `libexec/query_resources.rb` is doing.
    The added `to_json(*)` method now passes this test, and - shown in manual
    testing - works for bolt.
    DavidS committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    c6d1b3a View commit details
    Browse the repository at this point in the history
  3. Merge pull request puppetlabs#184 from DavidS/backports

    (maint) backport minor fixes from master to 1.6.x
    willmeek committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    7bcd01a View commit details
    Browse the repository at this point in the history
  4. (maint) implement desc/docs fallback

    This implements the changes specified in puppetlabs/puppet-specifications#141
    
    > The text and examples have been inconsistent with how `desc` vs `docs`
    > has been handled. This change fixes the text and examples to all show
    > and require `desc`, but accept `docs` in places where we showed it
    > previously.
    DavidS committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    89c8808 View commit details
    Browse the repository at this point in the history
  5. Merge pull request puppetlabs#177 from DavidS/maint-desc-docs-fallbac…

    …k-1.6.x
    
    (maint) implement `desc`/`docs` fallback
    DavidS committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    a1d9de2 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2019

  1. Configuration menu
    Copy the full SHA
    bb27c5f View commit details
    Browse the repository at this point in the history