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

Merged
merged 11 commits into from Nov 26, 2018

Conversation

Projects
None yet
2 participants
@garethgreenaway
Copy link
Member

commented Nov 26, 2018

Conflicts:
- tests/unit/transport/test_zeromq.py

dwoz and others added some commits Nov 11, 2018

More reliable pub server publishing
- Uses existing zmq context
- Store socket in thread local storage for re-use
- Add tests to verify publish reliability
pkg.installed currently fails when sources is used along with hold: T…
…rue. This was due to a change in #48426 that swapped out sending the pkgs variable for the desired variable instead.  This caused problems with pkg.hold because desired and sources are always populated, and pkg.hold can only include one or the other.  This change just includes desired in the call to pkg.hold since desired has the same value for sources.
Merge pull request #50590 from garethgreenaway/bp-50333
[2017.7] Back-port PR 50333 to 2017.7
Mike Place
Merge pull request #50463 from dwoz/zmqpubserv
More reliable pub server publishing
Merge branch '2017.7' into merge-2017
 Conflicts:
	tests/unit/transport/test_zeromq.py
@dwoz

dwoz approved these changes Nov 26, 2018

@dwoz

This comment has been minimized.

Copy link
Contributor

commented Nov 26, 2018

I've started the py2 windows tests again to see if the integration.modules.test_sysmod.SysModuleTest.test_valid_docs is being flaky or not.

@garethgreenaway garethgreenaway merged commit 61a824f into saltstack:2018.3 Nov 26, 2018

10 checks passed

WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
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/py2-windows-2016 The py2-windows-2016 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
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details

@garethgreenaway garethgreenaway deleted the garethgreenaway:merge-2017 branch Dec 20, 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.