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

Merged
merged 30 commits into from Nov 6, 2018

Conversation

Projects
None yet
6 participants
@rallytime
Copy link
Contributor

commented Nov 5, 2018

Conflicts:

  • salt/master.py
  • salt/transport/tcp.py
  • salt/transport/zeromq.py
  • tests/integration/cli/test_batch.py

mgomersbach and others added some commits Oct 19, 2018

Merge pull request #50252 from dwoz/backport_fs_fix
[2017.7] backport - Do not allow age to be a negative number
Merge pull request #50329 from twangboy/fix_cloud_winrm
Check WinRM port before initiating connection
Mike Place
Merge pull request #50195 from damon-atkins/jenkins_pylint
Jenkins CI Lint capture additional info
Brett Benassi
Fix ZMQ PubServer daemon logging works on winndows
Make the api to ZMQ PubServer more similar to tcp pubserver
Fix linter warnings
Fixes "Arguments number differs from overridden 'pre_fork' method'
Merge pull request #50350 from dubb-b/2017.7
Updating the AMI's and sizes for the test run.
Merge pull request #50345 from dwoz/pub_d_logging
Configure logging for ZMQ PubServer daemon
Merge pull request #50359 from dwoz/clitest
Increase cli batch test timeout for increased reliablity
Merge pull request #50354 from rallytime/version_num_docs
Add a few more feature release codenames to the version_numbers doc
Merge pull request #50128 from mgomersbach/fix-py3-reload-compat
Workaround for py2 builtin, =<3.3 imp and >=3.4 libimport quirks
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/master.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - tests/integration/cli/test_batch.py

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

@cachedout cachedout merged commit c2fda9d into saltstack:2018.3 Nov 6, 2018

9 of 10 checks passed

jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
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/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

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