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

merge upstream #1

Merged
merged 2,998 commits into from
Oct 2, 2018
Merged

merge upstream #1

merged 2,998 commits into from
Oct 2, 2018

Conversation

fraajad
Copy link
Owner

@fraajad fraajad commented Oct 2, 2018

What does this PR do?

What issues does this PR fix or reference?

Previous Behavior

Remove this section if not relevant

New Behavior

Remove this section if not relevant

Tests written?

Yes/No

Commits signed with GPG?

Yes/No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

rallytime and others added 30 commits September 27, 2018 15:40
Bugfix: zypper ZYPPER_EXIT_NO_REPOS exit code
Bugfix: zypper ZYPPER_EXIT_NO_REPOS exit code
Clean up install of package from shell test
Fix 3 bugs in subdict matching
fixing an issue where sentry logger would fail to get tags from grain…
Nicole Thomas and others added 29 commits September 30, 2018 14:39
…tice

Use py3-preferred plistlib API to load service plists.
Since "pchanges" was never supported in the state compiler, and
"changes" is what these reqs always used, replacing "pchanges" with
"changes" will allow those requisites to work in test mode.
This allows for a state return dict to be repacked so that the top level
keys are the IDs, making it much easier to analyze and craft asserts
against the results.
this requisite passes a __prerequired__ kwarg so these need to support
**kwargs for that reason.

This also changes the comment for salt.function in test mode because
it's inaccurate and doesn't make sense.
[develop] Adding some tests for the vault execution module.
[fluorine] Merge forward from 2018.3 to fluorine
[develop] Merge forward from fluorine to develop
Conflicts:
  - salt/cloud/clouds/saltify.py
  - salt/modules/network.py
  - tests/unit/modules/test_network.py
values need to be bytes when writing back to ldap
saltnado: teach runner about full_return
[develop] Merge forward from fluorine to develop
Don't return False when target exists (file.rename)
Change versionadded for loadable matchers to Neon
Replace pchanges with changes to make onchanges/prereq work in test mode
Document behavior change in file.rename state
@fraajad fraajad merged commit 80466c1 into fraajad:develop Oct 2, 2018
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.

9 participants