Back-port #32396 to 2016.3 #34095
Merged
Back-port #32396 to 2016.3 #34095
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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`
Closed
uqs
pushed a commit
to freebsd/freebsd-ports
that referenced
this pull request
Jul 13, 2016
Fixes cron.file from upstream issue #34094/#34095 [1]. This will be in 2016.3.2. - saltstack/salt#34094 - saltstack/salt#34095 Restore patch for upstream issue #33608. This was patched in 2016.3.0 but removed in the maintainer update to 2016.3.1 in r417508. However the patch has yet to be merged upstream. [2] - saltstack/salt#33608 PR: 210627 [1], 210395 [2] Reported by: Andres Montalban <amontalban@gmail.com> Approved by: Christer Edwards <christer.edwards@gmail.com> (maintainer) MFH: 2016Q3 git-svn-id: svn+ssh://svn.freebsd.org/ports/head@418455 35697150-7ecd-e111-bb59-0022644237b5
uqs
pushed a commit
to freebsd/freebsd-ports
that referenced
this pull request
Jul 13, 2016
Fixes cron.file from upstream issue #34094/#34095 [1]. This will be in 2016.3.2. - saltstack/salt#34094 - saltstack/salt#34095 Restore patch for upstream issue #33608. This was patched in 2016.3.0 but removed in the maintainer update to 2016.3.1 in r417508. However the patch has yet to be merged upstream. [2] - saltstack/salt#33608 PR: 210627 [1], 210395 [2] Reported by: Andres Montalban <amontalban@gmail.com> Approved by: Christer Edwards <christer.edwards@gmail.com> (maintainer) MFH: 2016Q3
uqs
pushed a commit
to freebsd/freebsd-ports
that referenced
this pull request
Jul 13, 2016
sysutils/py-salt: add patches to handle runtime regressions in 2016.3.x Fixes cron.file from upstream issue #34094/#34095 [1]. This will be in 2016.3.2. - saltstack/salt#34094 - saltstack/salt#34095 Restore patch for upstream issue #33608. This was patched in 2016.3.0 but removed in the maintainer update to 2016.3.1 in r417508. However the patch has yet to be merged upstream. [2] - saltstack/salt#33608 PR: 210627 [1], 210395 [2] Reported by: Andres Montalban <amontalban@gmail.com> Approved by: Christer Edwards <christer.edwards@gmail.com> (maintainer) Approved by: ports-secteam (with hat)
uqs
pushed a commit
to freebsd/freebsd-ports
that referenced
this pull request
Dec 2, 2016
sysutils/py-salt: add patches to handle runtime regressions in 2016.3.x Fixes cron.file from upstream issue #34094/#34095 [1]. This will be in 2016.3.2. - saltstack/salt#34094 - saltstack/salt#34095 Restore patch for upstream issue #33608. This was patched in 2016.3.0 but removed in the maintainer update to 2016.3.1 in r417508. However the patch has yet to be merged upstream. [2] - saltstack/salt#33608 PR: 210627 [1], 210395 [2] Reported by: Andres Montalban <amontalban@gmail.com> Approved by: Christer Edwards <christer.edwards@gmail.com> (maintainer) Approved by: ports-secteam (with hat)
uqs
pushed a commit
to freebsd/freebsd-ports
that referenced
this pull request
Apr 1, 2021
sysutils/py-salt: add patches to handle runtime regressions in 2016.3.x Fixes cron.file from upstream issue #34094/#34095 [1]. This will be in 2016.3.2. - saltstack/salt#34094 - saltstack/salt#34095 Restore patch for upstream issue #33608. This was patched in 2016.3.0 but removed in the maintainer update to 2016.3.1 in r417508. However the patch has yet to be merged upstream. [2] - saltstack/salt#33608 PR: 210627 [1], 210395 [2] Reported by: Andres Montalban <amontalban@gmail.com> Approved by: Christer Edwards <christer.edwards@gmail.com> (maintainer) Approved by: ports-secteam (with hat)
svmhdvn
pushed a commit
to svmhdvn/freebsd-ports
that referenced
this pull request
Jan 10, 2024
Fixes cron.file from upstream issue #34094/#34095 [1]. This will be in 2016.3.2. - saltstack/salt#34094 - saltstack/salt#34095 Restore patch for upstream issue #33608. This was patched in 2016.3.0 but removed in the maintainer update to 2016.3.1 in r417508. However the patch has yet to be merged upstream. [2] - saltstack/salt#33608 PR: 210627 [1], 210395 [2] Reported by: Andres Montalban <amontalban@gmail.com> Approved by: Christer Edwards <christer.edwards@gmail.com> (maintainer) MFH: 2016Q3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Back-port #32396 to 2016.3
Fixes #34094