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 2018.3.1 to 2018.3 #48210

Merged
merged 17 commits into from Jun 20, 2018

Conversation

Projects
None yet
5 participants
@rallytime
Contributor

rallytime commented Jun 19, 2018

No conflicts.

Ch3LL and others added some commits May 30, 2018

Merge pull request #47902 from Ch3LL/rn_in_progress
Remove In Progress for 2018.3.1 Release Notes
salt.modules.testinframod: fix TypeError invoking types.FunctionType
The __name__ attribute must be a str type, unicode types will result in
a TypeError.
Merge pull request #47973 from terminalmage/fix-testinfra
salt.modules.testinframod: fix TypeError invoking types.FunctionType
Merge pull request #47965 from Ch3LL/gitpy_mac_3.1
Add PR 47924 from 2018.3 branch
Merge pull request #48006 from Ch3LL/rn_update
Update 2018.3.1 release notes with new fixes

@rallytime rallytime merged commit 1f88df6 into saltstack:2018.3 Jun 20, 2018

9 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
WIP ready for review
Details
default Build finished.
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26069 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18123 — SUCCESS
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5866 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23796 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10837 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22758 — SUCCESS
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19920 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Jun 20, 2018

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