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

Unbreak cron.file #32396

Merged
merged 2 commits into from Apr 7, 2016
Merged

Unbreak cron.file #32396

merged 2 commits into from Apr 7, 2016

Conversation

eradman
Copy link
Contributor

@eradman eradman commented Apr 6, 2016

What does this PR do?

Unbreak cron.file

Previous Behavior

An extra argument (skip_verify) was recently added to get_managed(),
resulting in this error:

Unable to manage file: get_managed() takes exactly 11 arguments (10 given)

An extra argument (skip_verify) was recently added to get_managed(),
resulting in this error:

  Unable to manage file: get_managed() takes exactly 11 arguments (10 given)

Also eliminate a variable that can remain uninitialized when running
`salt-call`
@eradman
Copy link
Contributor Author

eradman commented Apr 6, 2016

I tested this fix manually, but feel free to consider this a working issue report if the correct fix should look different

@cachedout
Copy link
Contributor

Hi @eradman

Could you please fix this lint error? http://166.78.178.63:8080/job/PR/job/salt-pr-lint-n/851/violations/file/salt/states/cron.py/

Then we'll do a thorough review and hopefully get this in. Thanks!

@rallytime
Copy link
Contributor

Go Go Jenkins!

@cachedout cachedout merged commit 90b0a42 into saltstack:develop Apr 7, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Apr 7, 2016
* commit '90b0a42a21dc11ca118ffbb679e0871f234c17bc':
  Unbreak cron.file (saltstack#32396)
  Unbreak timezone test for Gentoo (saltstack#32420)
@eradman eradman deleted the cron_bug branch April 8, 2016 22:05
@avandendorpe
Copy link
Contributor

Did this fix just not make into the 2016.3.1 point release because it doesn't have an issue tracking it?

@rallytime
Copy link
Contributor

Hi @avandendorpe - this fix didn't make it into 2016.3.1 because it was submitted against the develop branch. I can backport it to 2016.3 now though to be included in 2016.3.2. Thank you for letting us know.

@rallytime rallytime added the ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. label Jun 17, 2016
cachedout pushed a commit that referenced this pull request Jun 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants