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

Merged
merged 22 commits into from Sep 12, 2018

Conversation

Projects
None yet
6 participants
@rallytime
Copy link
Contributor

commented Sep 11, 2018

Conflicts:

  • pkg/osx/build_env.sh
  • salt/cloud/clouds/proxmox.py
  • salt/minion.py
  • salt/modules/win_lgpo.py
  • salt/netapi/rest_tornado/init.py
  • salt/netapi/rest_tornado/saltnado.py
  • salt/returners/local_cache.py
  • salt/returners/rawfile_json.py
  • salt/utils/minions.py

twangboy and others added some commits Sep 6, 2018

Fix issues with build script on OSX
Upgrade openSSL to 1.0.2p
Upgrade six to 1.11
Merge pull request #49539 from twangboy/fix_osx_build_2
Fix issues with build script on OSX
Merge pull request #49541 from twangboy/fix_osx_build_2
Remove trusted host switches
[2017.7.8] Use correct path for is_true function
`data.py` does not exist in the salt/utils/ dir in the 2017.7 branch. We need to
use the old path.

This occurred from a backport and I missed the path change.
Merge pull request #49560 from rallytime/pkgng-fix
[2017.7.8] Use correct path for is_true function
Mike Place
Merge pull request #49570 from rallytime/doc-fixes
Some small doc fixes I noticed when poking around in the saltnado files
Merge pull request #49579 from dwoz/flaky_test
Increase timeout for flaky git test
Squelch error logging when varstack is not installed
This gets rid of spurious errors when varstack isn't installed. Most
people won't use this so these errors are not helpful.
Merge pull request #49584 from terminalmage/squelch-varstack-error
Squelch error logging when varstack is not installed
Mike Place
Merge pull request #49578 from twangboy/fix_49566
Use setup.py clean --all
Kill bare excepts with fire
These prevent the signal handlers from shutting down a process via a
raising a SystemExit. They are ticking time bombs of race conditions
that leave processes running when daemons are shut down or restarted.

Friends don't let friends use bare excepts.
Merge pull request #49595 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.8 to 2017.7
Merge branch '2017.7' into '2018.3'
Conflicts:
  - pkg/osx/build_env.sh
  - salt/cloud/clouds/proxmox.py
  - salt/minion.py
  - salt/modules/win_lgpo.py
  - salt/netapi/rest_tornado/__init__.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/returners/local_cache.py
  - salt/returners/rawfile_json.py
  - salt/utils/minions.py

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

@rallytime rallytime merged commit ab19082 into saltstack:2018.3 Sep 12, 2018

6 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
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
jenkins/pr/py3-ubuntu-1604 running py3-ubuntu-1604...
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-centos-7 The py2-centos-7 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

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Sep 12, 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.