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 #48161

Merged
merged 38 commits into from Jun 17, 2018

Conversation

Projects
None yet
6 participants
@rallytime
Contributor

rallytime commented Jun 15, 2018

Conflicts:

  • .kitchen.yml
  • doc/topics/releases/2017.7.6.rst
  • salt/modules/timezone.py
  • tests/support/case.py
  • tests/unit/modules/test_timezone.py

gtmanfred and others added some commits May 29, 2018

Merge pull request #47873 from gtmanfred/2017.7.6
allow tornado 5.0 to be installed only for python2
Update 2017.7.6 release notes: remove "unreleased" text
In preparation for the 2017.7.6 release, remove the "unreleased" text
from the release notes.
Merge pull request #47875 from rallytime/release-notes-dot-six
Update 2017.7.6 release notes: remove "unreleased" text
Merge pull request #47880 from gtmanfred/2017.7.6
quote python_version in requirements.txt
Merge pull request #48024 from gtmanfred/2017.7
add pytest coverage and xml junits
Ensure that the shared list of jids is passed when creating the Minio…
…n. Fixes an issue when minions are pointed at multiple syndics.
Merge pull request #48071 from terminalmage/gitfs-docs
Fix inaccurate gitfs_saltenv example in GitFS Walkthrough
Merge pull request #48075 from garethgreenaway/48038_jobs_are_not_ded…
…uping_minion_side

[2017.7] Ensure that the shared list of jids is passed
Merge pull request #48088 from rallytime/update_version_doc_2017.7
Update release versions for the 2017.7 branch
Reverse monkeypatching after test_symlink_list finishes
On Windows, in test_symlink_list we monkeypatch the file_roots. However,
we don't ever reverse that monkeypatching.

This would not have affected other test classes, because the opts we are
monkeypatching are ones created specifically for that test class. And
due to the lexicographic order in which the tests are run,
test_symlink_list is run last. However, if we were to ever add a test to
that test class which would run after test_symlink_list, it would be
affected by the monkeypatching.
Merge pull request #48091 from terminalmage/fix-file_roots-monkeypatc…
…hing

Reverse monkeypatching after test_symlink_list finishes
Merge branch '2017.7.6' into '2017.7'
Conflicts:
  - doc/topics/releases/2017.7.6.rst
  - requirements/base.txt
Merge pull request #48101 from rallytime/update-doc-refs-2017.7
[2017.7] Update 2017.7.7 reference to 2017.7.8

rallytime and others added some commits Jun 14, 2018

Merge pull request #48105 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.6 to 2017.7
Merge pull request #48135 from rallytime/release-notes-2017.7
Update the 2017.7.7 and 2017.7.8 release notes
Merge pull request #48143 from Ch3LL/fix_long_job
Add timeout argument to run_salt for ShellCase
Merge branch '2017.7' into '2018.3'
Conflicts:
  - .kitchen.yml
  - doc/topics/releases/2017.7.6.rst
  - salt/modules/timezone.py
  - tests/support/case.py
  - tests/unit/modules/test_timezone.py

@rallytime rallytime requested a review from saltstack/team-core as a code owner Jun 15, 2018

@rallytime rallytime merged commit 33400e7 into saltstack:2018.3 Jun 17, 2018

5 of 9 checks passed

jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10745 — ABORTED
Details
default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5774 — FAILURE
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19828 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25977 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18032 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23704 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22667 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Jun 17, 2018

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