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

Merged
merged 19 commits into from Oct 15, 2018

Conversation

Projects
None yet
6 participants
@rallytime
Copy link
Contributor

commented Oct 15, 2018

Conflicts:

  • salt/minion.py
  • salt/states/lvm.py

kyentei and others added some commits Oct 11, 2018

Fix documentation for mysql processlist
- Fix code block and indentation
Fix documentation on process.py
- Add clarification to the 'user' configuration
Fix proxy documentation
- Make user and password documentation identical
Fix LVM state documentation
- Capitalise the right words
- Add clarification to lv_absent on vgname
Fix gpg state Documentation
- gpg.absent doesn't add to user's keychain, but removes from
- gpg.present user explanation fix
Merge pull request #49997 from kyentei/doc-fix-mysql
Fix documentation for mysql processlist
Merge pull request #49998 from kyentei/doc-fix-process
Fix documentation on process.py
Merge pull request #50000 from kyentei/doc-fix-lvm
Fix LVM state documentation
Merge pull request #50001 from kyentei/doc-fix-gpg
Fix gpg state Documentation
Use parse_known_args when checking iptables rules
This will allow use of iptables custom extensions

Fixes #50014
Merge pull request #50012 from dwoz/norm_log
Use normal log formatting and add jid
allow empty service_account_private_key in GCE driver
Passing an empty service_account_private_key to libcloud will enable
authentication using instance credentials. Useful if you want to run salt-cloud
on a GCE instance.
Merge pull request #50017 from gtmanfred/iptables
Use parse_known_args when checking iptables rules
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/minion.py
  - salt/states/lvm.py

@rallytime rallytime requested a review from saltstack/team-core as a code owner Oct 15, 2018

@rallytime rallytime merged commit a9e9974 into saltstack:2018.3 Oct 15, 2018

7 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-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-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 15, 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.