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

do not shadow ret function argument #29207

Merged
merged 2 commits into from Nov 30, 2015

Conversation

Projects
None yet
2 participants
@jfindlay
Contributor

jfindlay commented Nov 25, 2015

Fixes #29161.

cachedout added a commit that referenced this pull request Nov 30, 2015

Merge pull request #29207 from jfindlay/ret_non_shadow
do not shadow ret function argument

@cachedout cachedout merged commit d42bcea into saltstack:2015.8 Nov 30, 2015

4 of 6 checks passed

default Merged build finished.
Details
jenkins/salt-pr-rs-cent6-n Salt PR - RS CentOS 6 #228 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #11516 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #2583 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #11224 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10053 — SUCCESS
Details

@jfindlay jfindlay deleted the jfindlay:ret_non_shadow branch Dec 1, 2015

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