[Don't merge] Ignore this: wrong target branch. #33895
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
states.service: minor doc updates
Add pillar_opts docs to master.rst
Document the postgres.psql_query function
Fix docs about etcd config options and add pillar_opts doc
Add docstring examples to glance.py and nova.py [2015.8]
…uccessfully-2015.8 jobs.exit_success allow to check if a job has executed and exit successfully
Avoid second grains load on windows multiprocessing
Fix diskusage beacon
Add docstring examples to glance.py [2015.5]
Add docs about minion config file in standalone minion docs
Fix build script where pip didn't work
Conflicts: - doc/ref/configuration/master.rst - doc/ref/configuration/minion.rst
[2015.8] Merge forward from 2015.5 to 2015.8
Conflicts: - salt/beacons/__init__.py - salt/modules/saltutil.py - salt/modules/zypper.py - salt/states/grains.py - salt/states/pkgrepo.py - salt/states/service.py
[2016.3] Merge forward from 2015.8 to 2016.3
Also fix an error in the `pkg.latest` state function caused by a difference in how brew reports versions for uninstalled vs installed packages.
Also remove unneeded system grains code.
Restore deafault log level to warning
This time win_servermanager
…er_test Fixing more stupid unit tests
These all assert directly against mock objects. They're pointless.
…_tests Remove matcher tests
…t_stacktrace Fix another unit test stacktrace in pkg_resource
Fix broken locate.locate function
[dockerng] Add support for edge case when `Cmd` and `Entrypoint` can't be blanked
Additional functionality to win_dism.py
This prevents stacktraces when the master is signaled for a shutdown but the sockets are already disconnected. Closes saltstack#33843
Conflicts: - salt/cli/salt.py - salt/modules/groupadd.py - salt/states/service.py
Allow socket closes when the socket is disconnected
[2016.3] Merge forward from 2015.8 to 2016.3
DmitryKuzmenko
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.