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.

Sign up for GitHub

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

Jump to bottom

[2015.8] Merge forward from 2015.5 to 2015.8 #34018

Merged
merged 17 commits into from
Jun 14, 2016
Merged

[2015.8] Merge forward from 2015.5 to 2015.8 #34018

merged 17 commits into from
Jun 14, 2016

Conversation

rallytime
Copy link
Contributor

Conflicts:

  • salt/modules/aptpkg.py
  • salt/modules/ebuild.py
  • salt/modules/zypper.py
  • salt/states/pkg.py
  • tests/integration/output/output.py

terminalmage and others added 17 commits June 8, 2016 16:28
@terminalmage
salt/modules/aptpkg.py: add fromrepo support to list_upgrades
4f11c16
@terminalmage
salt/modules/brew.py: add kwargs to list_upgrades
b40fc9b 
This is done for API compatibility
@terminalmage
salt/modules/ebuild.py: add kwargs to list_upgrades
76143b7 
This is done for API compatibility
@terminalmage
salt/modules/macports.py: add kwargs to list_upgrades
46e5a52 
This is done for API compatibility
@terminalmage
salt/modules/pacman.py: add kwargs to list_upgrades
5179dbc 
This is done for API compatibility
@terminalmage
salt/modules/pkgutil.py: add kwargs to list_upgrades
6e89a8b 
This is done for API compatibility
@terminalmage
salt/modules/solarisips.py: add kwargs to list_upgrades
bf5505f 
This is done for API compatibility
@terminalmage
salt/modules/win_pkg.py: add kwargs to list_upgrades
35fbb06 
This is done for API compatibility
@terminalmage
salt/modules/zypper.py: add fromrepo support to list_upgrades
de90b35
@terminalmage
pkg.uptodate: Pass kwargs to pkg.list_upgrades
ea726d1 
This resolves an edge case in which the "fromrepo" argument is passed to
the pkg.uptodate state. We pass through the kwargs to pkg.upgrade, but
do not pass the same kwargs to list_upgrades, resulting in inconsistent
results.
Work around upstream cherrypy bug
638ccf5 
Refs cherrypy/cherrypy#1444
Merge pull request saltstack#33904 from rallytime/bp-33806
cb88960 
Back-port saltstack#33806 to 2015.5
Merge pull request saltstack#33880 from terminalmage/zh744
6b98e8a 
pkg.uptodate: Pass kwargs to pkg.list_upgrades
@whiteinge
Add loader.utils() example to calling minion_mods (saltstack#33953)
cf6281b
Fix incorrectly written test (saltstack#34000)
f758e42 
This should be using the test suite method of generating opts
Lint fix for saltstack#34000 (saltstack#34005)
871f796
Merge branch '2015.5' into '2015.8'
77f44f3 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/modules/ebuild.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - tests/integration/output/output.py
@rallytime rallytime merged commit 5b5eae4 into saltstack:2015.8 Jun 14, 2016
@rallytime rallytime deleted the merge-2015.8 branch June 14, 2016 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@rallytime @terminalmage @whiteinge