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

Merged
merged 7 commits into from Sep 4, 2018

Conversation

Projects
None yet
3 participants
@rallytime
Copy link
Contributor

commented Sep 4, 2018

Conflicts:

  • salt/client/ssh/init.py
  • tests/integration/modules/test_win_ntp.py

rallytime and others added some commits Aug 30, 2018

Merge pull request #49461 from saltstack/revert-47100-ssh
Revert "Allow for not being prompted to supply a password to deploy keys to a…"
Mike Place
Merge pull request #49457 from rallytime/labels-docs
Remove references to unused milestones in docs
Merge pull request #49475 from dwoz/flaky_tests
Fix a flaky test and mark another as flaky
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/client/ssh/__init__.py
  - tests/integration/modules/test_win_ntp.py

@rallytime rallytime merged commit 81a49a8 into saltstack:2018.3 Sep 4, 2018

6 of 10 checks passed

jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py3-centos-7 running py3-centos-7...
Details
jenkins/pr/py3-windows-2016 running py3-windows-2016...
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-ubuntu-1604 The py2-ubuntu-1604 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 Sep 4, 2018

@rallytime rallytime restored the rallytime:merge-2018.3 branch Sep 5, 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.