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

Merged
merged 11 commits into from Oct 11, 2018

Conversation

Projects
None yet
4 participants
@rallytime
Copy link
Contributor

commented Oct 10, 2018

Conflicts:

  • salt/beacons/inotify.py

rallytime and others added some commits Oct 8, 2018

Remove event_publisher_pub_hwm and salt_event_pub_hwm from documentation
Fixes #49925

The `event_publisher_pub_hwm` and `salt_event_pub_hwm` configuration options
were removed in #38723. (They are obsolete and not used within salt any longer.)

When those options were removed, I neglected to remove them from the docs. This
PR cleans up the references in the docs.
Merge pull request #49934 from rallytime/fix-49925
Remove event_publisher_pub_hwm and salt_event_pub_hwm from documentation
using an exclude list that does not list every operating system leave…
…s open the possability that it would work on those not listed
Merge pull request #49978 from whytewolf/inotify_doc_change
remove the incomplete exclude list.
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/beacons/inotify.py

@rallytime rallytime merged commit 8949873 into saltstack:2018.3 Oct 11, 2018

6 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP ready for review
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
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

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