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

[2019.2] Merge forward from 2018.3 to 2019.2 #52397

Merged
merged 11 commits into from Apr 2, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Apr 2, 2019

Conflicts:

  • tests/unit/grains/test_core.py
garethgreenaway and others added 11 commits Mar 16, 2019
…omments.
…ve_comments

[2018.3] removing use of comments from incron modules
Fall back to old way of getting osrelease grain if new way fails
…_test_true

[2018.3] Don't save beacons when test=True
 Conflicts:
   - tests/unit/grains/test_core.py
@garethgreenaway garethgreenaway requested a review from saltstack/team-core Apr 2, 2019
@garethgreenaway garethgreenaway changed the title [develop] Merge forward from 2018.3 to 2019.2 [2019.2] Merge forward from 2018.3 to 2019.2 Apr 2, 2019
@dwoz
dwoz approved these changes Apr 2, 2019
@dwoz dwoz merged commit 3675f1e into saltstack:2019.2 Apr 2, 2019
10 checks passed
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 Python lint test 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
Projects
None yet
3 participants
You can’t perform that action at this time.