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

Back-port #47913 to 2018.3 #47931

Merged
merged 1 commit into from Jun 4, 2018

Conversation

Projects
None yet
2 participants
@rallytime
Contributor

rallytime commented Jun 1, 2018

Back-port #47913 to 2018.3

Fixup! beacons/avahi_announce.py finding grains
This pull resquest broke the avahi_announce
#45657
because len('grains.') is 7 and not 6 as this
change say.
What happens now is that is looking in
__grains__ for '.{grain_name}' instead of {grain_name}.

Signed-off-by: Rares POP <rares.pop@ni.com>

@rallytime rallytime merged commit 4db1f8c into saltstack:2018.3 Jun 4, 2018

6 of 9 checks passed

jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19491 — ABORTED
Details
default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5435 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25632 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17703 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23369 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10408 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22333 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:bp-47913 branch Jun 4, 2018

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