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

Add nick to args for create_multi #38281

Merged
merged 1 commit into from
Dec 16, 2016

Conversation

mikejford
Copy link
Contributor

What does this PR do?

Adds the nick arg to the create_multi method call in send_msg_multi function

Previous Behavior

The nick was always set to the default value "Saltstack Bot"

New Behavior

The nick is set to the value passed as the nick argument to the xmpp.send_msg_multi function

Tests written?

No tests added

Added the nick argument to the args provided to create_multi in the
send_msg_multi function
@rallytime
Copy link
Contributor

Good catch and thanks for submitting this fix @mikejford! Before we get this fix in, however, this needs to move to the 2016.3 branch, as the 2015.8 branch is closed for non-CVE related fixes.

@rallytime rallytime added the Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged label Dec 16, 2016
@mikejford
Copy link
Contributor Author

The contributing documentation was unclear to me, and I didn't find a definitive statement regarding supported branch versions. Is there a quick git command to move this onto the 2016.3 branch or do I need to submit new PR?

"If you're working on a bug or documentation fix, create your branch from the oldest release branch that contains the bug or requires the documentation update."

@rallytime
Copy link
Contributor

@mikejford Yeah, good point we don't really have that documented as to what the "oldest supported release branch" currently is. I might be able to move the PR to a different branch from this page.

@rallytime rallytime changed the base branch from 2015.8 to 2016.3 December 16, 2016 16:44
@rallytime
Copy link
Contributor

There we go! Now we'll just wait for these tests to run again.

Thanks again @mikejford!

@rallytime rallytime removed the Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged label Dec 16, 2016
@rallytime rallytime merged commit 6367ca7 into saltstack:2016.3 Dec 16, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Dec 20, 2016
* upstream/develop: (24 commits)
  Add missing CLI examples to grafana4 module (saltstack#38357)
  Remove dup LXC doc reference
  Use correct import of salt.utils.event (not just "salt") (saltstack#38350)
  Fixed nested orchestrate not respecting failures
  Adjust alternatives test for updated error message
  Suppress errors when checking if an alternative exists
  fix(win_functions): syntax
  fix(win_function): handle other language
  fix detection of runit as init system (grain init)
  Update the Cloud Provider Specifics links in cloud docs
  Add azurearm module to doc index (saltstack#38322)
  Add nick to args for create_multi (saltstack#38281)
  Improve documentation for archive.extracted in 2016.11 (saltstack#38291)
  Use machine readable output for list
  Added limit-output to eliminate false packages
  Fixed display of errors
  Fixed state.salt.runner return value on exceptions
  Avoid normalization call for normalized mode value
  make it explicit that we want to delete these keys
  Fixed faulty logic preventing instance initialisation.
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants