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

Merged
merged 12 commits into from Nov 30, 2018

Conversation

Projects
None yet
6 participants
@Ch3LL
Copy link
Contributor

commented Nov 29, 2018

Conflicts:

  • salt/modules/file.py

Also updated salt.utils.is_windows() call to salt.utils.platform.is_windows()

Oloremo and others added some commits Nov 21, 2018

Fix lint only changes, full lint on merge forwards
- lint only changes previous diff picked up out of data files, when the branch was out of date.
- full limit on merge forward to pick up changes in the lint checks between versions.
- update CODEOWNERS for .ci/*
Merge pull request #50605 from Oloremo/fix-supervisord-dead-state-ide…
…mpotency

Fixed the supervisord.dead state idempotency
Mike Place
Merge pull request #50583 from damon-atkins/jenkins_pylint
Fix lint only changes, full lint on merge forwards
When using the gem installed state, when passing a version that inclu…
…des greater than or less than symbols, ensure that the installed versions meets that requirement.
Mike Place
Merge pull request #50659 from garethgreenaway/49954_gem_installed_le…
…ss_than_greater_than_support

[2017.7] fixes to gem state when using greater than or less than versions
When using file.replace, with the search_only option, if the pattern …
…does not exist in the file then we should return False.
Merge pull request #50672 from garethgreenaway/49691_file_replace_sea…
…rch_only_return_false

[2017.7] fixes to file.replace with search_only
Merge branch 2017.7 into 2018.3
Conflicts:
  - salt/modules/file.py

@garethgreenaway garethgreenaway requested a review from saltstack/team-core Nov 29, 2018

@damon-atkins

This comment has been minimized.

Copy link
Member

commented Nov 30, 2018

This needs #50670

@damon-atkins

This comment has been minimized.

Copy link
Member

commented Nov 30, 2018

And #50702 after some more testing.

@cachedout cachedout merged commit edaa9fe into saltstack:2018.3 Nov 30, 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
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.