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

Proxmox fixups #50148

Merged
merged 2 commits into from Oct 22, 2018

Conversation

Projects
None yet
2 participants
@MTecknology
Copy link
Contributor

commented Oct 21, 2018

What does this PR do?

  • Change delay between halt and delete from 1 to 3 seconds; race condition still existed
  • Add ability to set ssh pubkey for root on containers

Tests written?

No

Commits signed with GPG?

Yes

MTecknology added some commits Oct 21, 2018

@salt-jenkins salt-jenkins requested a review from saltstack/team-cloud Oct 21, 2018

@gtmanfred gtmanfred merged commit ce375f4 into saltstack:2018.3 Oct 22, 2018

8 of 10 checks passed

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
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/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 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.