Skip to content

Conversation

@hatifnatt
Copy link
Contributor

PR progress checklist (to be filled in by reviewers)

  • Changes to documentation are appropriate (or tick if not required)
  • Changes to tests are appropriate (or tick if not required)
  • Reviews completed

What type of PR is this?

Primary type

  • [build] Changes related to the build system
  • [chore] Changes to the build process or auxiliary tools and libraries such as documentation generation
  • [ci] Changes to the continuous integration configuration
  • [feat] A new feature
  • [fix] A bug fix
  • [perf] A code change that improves performance
  • [refactor] A code change that neither fixes a bug nor adds a feature
  • [revert] A change used to revert a previous commit
  • [style] Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)

Secondary type

  • [docs] Documentation changes
  • [test] Adding missing or correcting existing tests

Does this PR introduce a BREAKING CHANGE?

No.

Related issues and/or pull requests

Describe the changes you're proposing

Lists does not get merged by grains.filter_by therefore to preserve all items from less specific map files (i.e. osmap) they must be copied to more specific map files (i.e. to osfingermap) otherwise, only items from latest map file will be used.

Pillar / config required to test the proposed changes

N/A

Debug log showing how the proposed changes work

Documentation checklist

  • Updated the README (e.g. Available states).
  • Updated pillar.example.

Testing checklist

  • Included in Kitchen (i.e. under state_top).
  • Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
  • Updated the relevant test pillar.

Additional context

Lists does not get merged by grains.filter_by therefor to preserve
all items from less specific map files (i.e. osmap) they must be
copied to more specific map files (i.e. to osfingermap) otherwise,
only items from latest map file will be used.
@myii myii merged commit 6665a27 into saltstack-formulas:master Mar 10, 2021
@myii
Copy link
Contributor

myii commented Mar 10, 2021

Merged, thanks for the clean-up, @hatifnatt.

@saltstack-formulas-travis

🎉 This PR is included in version 1.1.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@hatifnatt
Copy link
Contributor Author

@myii thanks, that was fast I have 2 more :)
Just waited for pipelines to finish - looks like no problems with commit messages etc.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants