Run restart master minion last

[remichristiaan]

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

Pillar / config required to test the proposed changes

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

[pull-assistant[bot]]

Best reviewed: commit by commit

---

Optimal code review plan (3 warnings)

fix(*): fix to allow deployment with salt-ssh.

> `...files/minion.d/f_defaults.conf` 67% changes removed in fix(*): reverted fix... > `salt/ssh.sls` 67% changes removed in Merge branch 'master... > `salt/standalone.sls` 75% changes removed in Merge branch 'master... > `salt/cloud.sls` 75% changes removed in Merge branch 'master...

Merge branch 'master' of https://github.com/saltstack-formulas/salt-fo...

> `AUTHORS.md` 75% changes removed in Merge branch 'master... > `...1803-py2/controls/pkgs_spec.rb` 55% changes removed in Merge branch 'master... > `FORMULA` 50% changes removed in Merge branch 'master... > `...1902-py2/controls/pkgs_spec.rb` 55% changes removed in Merge branch 'master...

Merge branch 'master' of https://github.com/saltstack-formulas/salt-fo...

> `...1803-py2/controls/pkgs_spec.rb` 50% changes removed in Merge branch 'master... > `...1902-py2/controls/pkgs_spec.rb` 50% changes removed in Merge branch 'master... > `docs/AUTHORS.rst` 50% changes removed in Merge branch 'master... > `AUTHORS.md` 50% changes removed in Merge branch 'master...

     fix(*): reverted fix to allow deployment with salt-ssh.      Merge branch 'master' of https://github.com/saltstack-formulas/salt-fo...      fix(service): service `salt-master` and 'salt-minion' to (re)start las...

Powered by Pull Assistant. Last update 34411bb ... 0b65074. Read the comment docs.

[remichristiaan]

Something went haywire with the commits ... there should be only one.