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

[2018.3] Merge forward from 2017.7 to 2018.3 #48394

Merged
merged 40 commits into from Jul 1, 2018

Conversation

Projects
None yet
10 participants
@rallytime
Contributor

rallytime commented Jun 30, 2018

Conflicts:

  • salt/modules/rabbitmq.py
  • tests/integration/modules/test_pip.py

twangboy and others added some commits Jun 13, 2018

If pip binary is passed to bin_env, use that pip binary
We don't need to do a lookup for python to then run `python -m pip`
because we already know where pip is.

Fixes using /bin/pip3

Fixes #48122
dont reset system locale when running rabbitmqctl commands
Observe the errors with rabbitmq 3.7.3.
```
ERROR: RabbitMQ command failed: warning: the VM is running with native name encoding of latin1 which may cause Elixir to malfunction as it expects utf8.
Please ensure your locale is set to UTF-8 (which can be verified by running "locale" in your shell)
```
Properly wait on returns in saltnado
This was broken because the behavior was to simply check the ckminions
and wait for only those returns to complete. This works assuming
ckminions is accurate (which there are many cases where it isn't, such
as syndics).

_disbatch_local's waiting on returns needs to match LocalClient's
behavior (namely that in get_iter_returns). This means we are allowed to
return when (1) we have waitged the min_wait_time (0 if not a syndic)
(2) no minions are running the job (3) all minions we saw running it are
done running the job. The only method allowed for earlier termination is
if the gather_job_timeout is exceeded.

Fixes #42659
Properly configure syndic in test case
Without this option we aren't really a syndic and it won't wait
Merge pull request #48117 from twangboy/fix_48026
service.disabled on Windows
Test using different credentials
I also shortened up the linting steps considerably...
Use proper creds with githubNotify
I also made it more generic for the distros.
Merge pull request #48324 from Ch3LL/update_version_doc_2017.7
Update release versions for the 2017.7 branch
Merge pull request #48349 from ralex/fix-manjaro-service-behaviour
Disable the "service" module on Manjaro since it is using systemd
Merge pull request #48329 from rallytime/codeowners-roster-files
Trigger review requests for team-ssh for roster files
Merge pull request #48352 from Ch3LL/wheel_doc
Add missing key to accept_dict function in wheel docs
Merge pull request #48363 from dubb-b/2017.7
Changing debug to info for logging
Use explicit parameter names
Optimize lookups
80 character lines

twangboy and others added some commits Jun 29, 2018

Add warnings plugin to replace violations
This plugin has no violations. There is **NO DOCUMENTATION** for this
entire plugin. And I still don't entirely understand how this being the
name of a step makes it work.
Merge pull request #48362 from twangboy/fix_48276
Fix stacktrace when registry entries are missing
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/modules/rabbitmq.py
  - tests/integration/modules/test_pip.py

@cachedout cachedout merged commit 3b53e2d into saltstack:2018.3 Jul 1, 2018

7 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
default Pull Requests » Salt PR - Main Build - PY2/PY3 #9889
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #11131 — ABORTED
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26371 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18410 — SUCCESS
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #6161 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #24089 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #23045 — SUCCESS
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #20214 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Jul 2, 2018

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