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

Backport #52368 into 2018.3 #53456

Closed
wants to merge 48 commits into from
Closed

Backport #52368 into 2018.3 #53456

wants to merge 48 commits into from

Conversation

Ch3LL
Copy link
Contributor

@Ch3LL Ch3LL commented Jun 11, 2019

Backport #52368 into 2018.3

mchugh19 and others added 18 commits June 11, 2019 15:48
Conflicts:
  - salt/engines/script.py
  - salt/modules/azurearm_dns.py
  - salt/modules/baredoc.py
  - salt/modules/boto_ssm.py
  - salt/modules/nxos_upgrade.py
  - salt/modules/saltsupport.py
Conflicts:
  - salt/pillar/nsot.py
  - salt/returners/appoptics_return.py
  - salt/returners/slack_webhook_return.py
Conflicts:
  - salt/states/azurearm_dns.py
  - salt/states/lxd_container.py
  - salt/states/nova.py
  - salt/states/postgres_default_privileges.py
  - salt/states/saltsupport.py
  - salt/states/zabbix_service.py
Conflicts:
  - doc/ref/modules/all/index.rst
  - doc/ref/pillar/all/index.rst
  - doc/ref/proxy/all/index.rst
  - doc/ref/states/all/index.rst
  - salt/returners/slack_webhook_return.py
  - salt/states/azurearm_dns.py
  - salt/states/lxd_image.py
Conflicts:
  - salt/renderers/aws_kms.py
@Ch3LL Ch3LL requested a review from a team as a code owner June 11, 2019 20:42
@ghost
Copy link

ghost commented Jun 11, 2019

@Ch3LL, thanks for your PR! By analyzing the history of the files in this pull request, we identified @ryan-lane and @tkwilliams to be potential reviewers.

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

Successfully merging this pull request may close these issues.

3 participants