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

[2018.3] Merge forward from 2017.7 to 2018.3 #49543

Merged
merged 37 commits into from Sep 7, 2018

Conversation

Projects
None yet
6 participants
@rallytime
Copy link
Contributor

commented Sep 6, 2018

Conflicts:

  • requirements/opt.txt
  • requirements/tests.txt
  • salt/modules/win_service.py
  • tests/integration/states/test_service.py

Ch3LL and others added some commits Aug 14, 2018

Merge pull request #49113 from Ch3LL/rn_7.8
Add changelog to 2017.7.8 release notes
Merge pull request #49116 from twangboy/fix_installer
Fix windows installer script
Fix Windows and OSX installers
Adds support to Universal Runtime Libraries (UCRT) for Windows
Adds futures to the req.txt for OSX
Merge pull request #49218 from twangboy/fix_installer
Fix Windows and OSX installers
Add 64bit binaries for KB2999226 to the x86 installer
Fix logic where it detects the Architecture of the system running the
installer instead of the one building the installer
Add a 3 seconds pause to actually see the error code if it throws one
Merge pull request #49272 from twangboy/fix_installer_more
Add 64 bit binaries for KB2999226 to the x86 installer
Merge pull request #49284 from twangboy/fix_installer_osx
Fix path to libsodium tarball
Fix issues with win_service
Add shlex.quote
Properly quote the path to the binary (bin_path) on create and modify
Don't crash on service.stop when the service is already stopped
Don't crash on service.delete when the service is not present
Fix issues with the exception handling
Mike Place
Pin CherryPy version to < 18.0.0 in requirements files for PY2
Version 18.0 now requires Python 3.5, so we need to pin this for Py2.
Merge pull request #49498 from rallytime/pin-cherrypy-2017.7.8
Pin CherryPy version to < 18.0.0 in requirements files for PY2
Merge pull request #49505 from Ch3LL/rn_7.8_2
Update 2017.7.8 ChangeLog with new fixes
Merge pull request #49327 from twangboy/fix_win_service
Fix issues with win_service

rallytime and others added some commits Sep 5, 2018

Add "in progess" notation back to 2017.7.8 release notes
We need this notation in the branch for now. We will remove it once the release
is live.
Add some files to the CODEOWNERS files for team-core to own
And also fix a couple of bugs found when writing tests for the matching used
by tamarack bot. This expands the files that the core team will be requested for
on pull request reviews.
Mike Place
Merge pull request #49515 from rallytime/update-codeowners
Add some files to the CODEOWNERS files for team-core to own
Merge pull request #49512 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.8 to 2017.7
Remove special handling for file_envs fileserver func
#49389 made this special handling obsolete.
Merge pull request #49527 from terminalmage/remove-special-envs-handling
Remove special handling for file_envs fileserver func
Merge branch '2017.7' into '2018.3'
Conflicts:
  - requirements/opt.txt
  - requirements/tests.txt
  - salt/modules/win_service.py
  - tests/integration/states/test_service.py

@rallytime rallytime merged commit 1a41b47 into saltstack:2018.3 Sep 7, 2018

6 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Sep 7, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.