Justin Anderson
02f9ba99ba
Updated version check. Moved check into it's own function
2016-06-20 10:33:13 -06:00
Justin Anderson
d445026c56
Updated test to work with new moto version. Changed strings to unicode
2016-06-20 09:26:39 -06:00
Nicole Thomas
871f7966ce
Lint fix for #34000 ( #34005 )
2016-06-14 11:12:14 -04:00
Mike Place
f758e42172
Fix incorrectly written test ( #34000 )
...
This should be using the test suite method of generating opts
2016-06-14 11:10:21 -04:00
Seth House
cf6281b4cf
Add loader.utils() example to calling minion_mods ( #33953 )
2016-06-11 11:52:35 -04:00
Mike Place
6b98e8a9ea
Merge pull request #33880 from terminalmage/zh744
...
pkg.uptodate: Pass kwargs to pkg.list_upgrades
2016-06-10 09:00:14 -07:00
Mike Place
cb88960ed1
Merge pull request #33904 from rallytime/bp-33806
...
Back-port #33806 to 2015.5
2016-06-10 08:21:14 -07:00
Mike Place
638ccf501d
Work around upstream cherrypy bug
...
Refs https://github.com/cherrypy/cherrypy/issues/1444
2016-06-09 09:09:10 -06:00
Erik Johnson
ea726d11c8
pkg.uptodate: Pass kwargs to pkg.list_upgrades
...
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.
2016-06-08 17:07:24 -05:00
Erik Johnson
de90b35d2b
salt/modules/zypper.py: add fromrepo support to list_upgrades
2016-06-08 16:41:43 -05:00
Erik Johnson
35fbb06df5
salt/modules/win_pkg.py: add kwargs to list_upgrades
...
This is done for API compatibility
2016-06-08 16:41:32 -05:00
Erik Johnson
bf5505f425
salt/modules/solarisips.py: add kwargs to list_upgrades
...
This is done for API compatibility
2016-06-08 16:41:25 -05:00
Erik Johnson
6e89a8be98
salt/modules/pkgutil.py: add kwargs to list_upgrades
...
This is done for API compatibility
2016-06-08 16:41:17 -05:00
Erik Johnson
5179dbcec4
salt/modules/pacman.py: add kwargs to list_upgrades
...
This is done for API compatibility
2016-06-08 16:41:10 -05:00
Erik Johnson
46e5a52784
salt/modules/macports.py: add kwargs to list_upgrades
...
This is done for API compatibility
2016-06-08 16:41:01 -05:00
Erik Johnson
76143b76ca
salt/modules/ebuild.py: add kwargs to list_upgrades
...
This is done for API compatibility
2016-06-08 16:40:52 -05:00
Erik Johnson
b40fc9bc62
salt/modules/brew.py: add kwargs to list_upgrades
...
This is done for API compatibility
2016-06-08 16:40:07 -05:00
Erik Johnson
4f11c16d86
salt/modules/aptpkg.py: add fromrepo support to list_upgrades
2016-06-08 16:28:17 -05:00
Mike Place
cdda593c50
Merge pull request #33829 from terminalmage/update-versionchanged
...
Update versionchanged directive
2016-06-08 06:45:45 -07:00
Mike Place
b8e6c144d8
Merge pull request #33833 from terminalmage/issue33645
...
Support syncing pillar modules to masterless minions
2016-06-08 06:43:16 -07:00
Erik Johnson
91745c2a67
Support syncing pillar modules to masterless minions
...
Resolves #33645 .
2016-06-07 13:50:48 -05:00
Erik Johnson
f7028eb1c6
Update versionchanged directive
...
This change did not make it into 2015.5.11, and it is not certain at
this time whether or not we will do a 2015.5.12.
2016-06-07 12:26:02 -05:00
Mike Place
e061788e81
Merge pull request #33814 from terminalmage/archive-extracted-xz
...
Support extraction of XZ archives in archive.extracted state
2016-06-07 07:36:48 -07:00
Erik Johnson
897a716df2
Support extraction of XZ archives in archive.extracted state
...
Using an XZ-compressed archive with archive.extracted raises a
tarfile.ReadError exception, as only gzip and bzip2 are supported by
tarfile. This commit catches that exception and attempts to extract
using xz-utils, if present.
It also makes some clarifications and corrections to the documentation.
2016-06-07 02:07:30 -05:00
Mike Place
fa983e91cf
Merge pull request #33778 from sodium-chloride/2015.5-2016-0604-1938
...
Fix minor docstring issues
2016-06-06 03:44:16 -07:00
Jεan Sacren
a5fb6d7a69
Fix minor docstring issues
...
The network.get_bufsize function requires an interface for arg. In the
example, the argument is missing and the function name is a little bit
off. Add arbitrary 'eth0' for argument and correct the name.
2016-06-04 19:41:36 -06:00
Mike Place
b9133326c8
Merge pull request #33726 from jtand/sysmod_skip_valid_docs_glance
...
glance.warn_until shouldn't be checked for a doc string
2016-06-03 09:06:08 -07:00
Justin Anderson
ebee8a89af
glance.warn_until shouldn't be checked for a doc string
2016-06-02 16:30:36 -06:00
Mike Place
137f0b19f3
Merge pull request #33611 from TargetHolding/2015.5
...
2015.5
2016-06-02 12:32:58 -07:00
Rolf Fokkens
1dd15a603b
solve' TypeError: expected string or buffer' in json/decoder.py
2016-05-29 16:08:48 +02:00
Rolf Fokkens
eaf42ca892
solve AttributeError: 'module' object has no attribute 'exception'
2016-05-29 16:06:59 +02:00
Mike Place
6f7fda0354
Merge pull request #33486 from jtand/2015.5
...
Add docstring examples to glance.py [2015.5]
2016-05-25 10:21:22 -07:00
Mike Place
f72ec1479b
Merge pull request #33482 from rallytime/pillar-opts-docs
...
Add pillar_opts docs to master.rst
2016-05-25 09:39:25 -07:00
Justin Anderson
d1e210fff8
Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5
2016-05-25 10:28:18 -06:00
Mike Place
dc644b145d
Merge pull request #33488 from rallytime/fix-18752
...
Add docs for the syndic_finger config
2016-05-25 08:23:10 -07:00
rallytime
b0a9f4181f
Add docs for the syndic_finger config
...
Fixes #18752
2016-05-24 16:10:43 -06:00
Justin Anderson
ee2ae0ea8a
Added docstring examples to glance.image_schema and schema_get
2016-05-24 15:16:07 -06:00
Justin Anderson
59e90064e6
modules.swift.head does not have a body. Should not be checked for a docstring right now.
2016-05-24 14:58:32 -06:00
rallytime
087564528d
Add pillar_opts docs to master.rst
2016-05-24 13:26:24 -06:00
Mike Place
a4e84aa7d2
Merge pull request #33454 from scubahub/2015.5
...
Correct (and make consistent) determination of the test flag.
2016-05-24 09:12:57 -07:00
Daniel Wallace
3a52ace673
manage account information for pam ( #33473 )
...
Make sure to run the account sections of pam.d directives.
Closes #32455
2016-05-24 09:05:39 -07:00
Oscar Steele
df3c0b8e78
Correct (and make consistent) determination of the test flag.
...
Fixes : #33363
2016-05-23 14:45:26 -07:00
Justin Findlay
2cc650965a
update 2015.5.11 release notes ( #33412 )
2016-05-20 15:08:35 -06:00
Nicole Thomas
dc8ce2d8b1
Fix traceback in logging for config validation ( #33386 ) ( #33405 )
2016-05-20 13:48:15 -07:00
Thomas S Hatch
d15f5e2cef
Merge pull request #33383 from thatch45/2015.5
...
maintain the fallabck because I am totally sick of this crap
2016-05-19 18:03:59 -06:00
Thomas S Hatch
f5ebcba21c
restore whitespace
2016-05-19 17:01:19 -06:00
Thomas S Hatch
1d8b289db1
blast, put the try/except int he right place
2016-05-19 17:00:16 -06:00
Thomas S Hatch
081e6c5b83
maintain the fallabck because I am totally sick of this crap
2016-05-19 16:33:15 -06:00
Mike Place
755acfb97e
Improve doc clarity for disable_modules documentation ( #33379 )
...
* Improve doc clarity for disable_modules documentation
* Additional clarification on blacklisted name
2016-05-19 16:31:41 -06:00
Mike Place
2b5ad128bf
Better YAML syntax error handling ( #33375 )
...
Closes #26574
2016-05-19 15:56:45 -06:00