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

Merged
merged 39 commits into from Aug 1, 2018

Conversation

Projects
None yet
7 participants
@rallytime
Contributor

rallytime commented Jul 31, 2018

Conflicts:

  • salt/modules/slsutil.py
  • salt/modules/win_timezone.py
  • salt/states/pkg.py
  • tests/integration/states/test_pkg.py

OrlandoArcapix and others added some commits May 18, 2018

#47698 improve run-speed of pip package state checks by only loading …
…the current package list once when checking multiple packages
Merge branch 'Issue47689-pip-state-performance' of github.com:Orlando…
…Arcapix/salt into Issue47689-pip-state-performance
Merge pull request #48788 from Ch3LL/timezone_windows
Add timzeone windows integration tests and fix get_zone
Merge pull request #48834 from gtmanfred/slsutil
read output of stringio if it is readable
Merge pull request #48840 from gtmanfred/docs
fix links in pkg doc.
Merge pull request #48662 from slaws/fix-retention-schedule-48637
Excluding relative dirs in state.file.retention_schedule
Fixing a situation when a package is already installed via salt or ma…
…nually and a state attempts to set that package to be held. Previously the holding/unholding logic was only being run against packages that were being installed. This change moves the holding logic outside and runs it against all desired packages. Adding a new test to test holding logic.
General cleanup in pkg state, reducing duplicate code. Fixing the req…
…uires_salt_modules decorator, sys.doc was returning too much information for the event to handle. This change specifically calls sys.doc with the module name.

garethgreenaway and others added some commits Jul 31, 2018

Merge pull request #48844 from AVeenstra/fix-python3-incompatibility
Fixed Python 3 incompatibility in methods in nilrt_ip and debian_ip.
Merge pull request #47734 from OrlandoArcapix/Issue47689-pip-state-pe…
…rformance

#47689 improve run-speed of pip package state
Skip tests in integration.shell.test_master
Related to saltstack/salt-jenkins#378

This is likely causing all of the flakiness we're seeing on test runs
when the master stops responding.

These tests should be in their own, isolated run, rather than with
the rest of the test suite.
Merge pull request #48426 from garethgreenaway/46689_fixing_pkg_held_…
…when_package_is_installed

[2017.7] fixes to states/pkg.py
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/modules/slsutil.py
  - salt/modules/win_timezone.py
  - salt/states/pkg.py
  - tests/integration/states/test_pkg.py

@rallytime rallytime merged commit a8376b5 into saltstack:2018.3 Aug 1, 2018

6 of 8 checks passed

jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
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-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 Aug 1, 2018

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