valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
78,177 Commits 24 Branches 182 Tags 341 MiB
41220e799f
Commit Graph

78177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
c88896c277 Avoid recursion in s3/svn ext_pillars 
This passes ``ext=False`` when compiling pillar data in these ext_pillar
sources.
 2017-02-07 15:38:53 -06:00
Erik Johnson
ad1b1255f2 Add clarification for jenkins execution module 
There are two modules on PyPI which import as "jenkins". Installing the
wrong one will result in a traceback when the execution module tries to
use the Python bindings. This commit adds information about the
dependency to the docstring for the module. It also checks to make sure
that jenkins.Jenkins is present in the __virtual__() func, and if not it
will fail to load the execution module with a meaningful error message
in the log.
 2017-02-07 15:03:11 -06:00
rallytime
50b9ac6a6d Fixup docs that don't have a CLI Example 
- log functions shouldn't be used at the CLI level: added to allow_failure in test
- Added example for status.proxy_reconnect
 2017-02-07 13:40:01 -07:00
Daniel Wallace
afee047b08 default to utf8 encoding if not specified 
On errors, for some reason AWS does not always have an encoding on the
message.  Default to 'utf-8'.
 2017-02-07 14:28:03 -06:00
Joseph Hall
ba63573365 Add import back in 2017-02-07 12:51:21 -07:00
Erik Johnson
c750662946 Loader optimzation 
Use a str.join instead of str.format to make the full function name.
 2017-02-07 13:50:41 -06:00
Joseph Hall
87fd95df1b Pass in existing __utils__ instead of making a new one 2017-02-07 11:41:56 -07:00
Mike Place
1a3be2ce2a Merge pull request #39205 from cachedout/revert_36525 
Revert "Cache the renderer in the pillar"
 2017-02-07 11:24:56 -07:00
Mike Place
45828e833b Merge pull request #39033 from xbglowx/dockerng_devices 
dockerng support for --device
 2017-02-07 11:24:19 -07:00
Erik Johnson
fd3284f0c7 Put legacy git_pillar on a deprecation path for Oxygen (#39225) 
This adds a warning when legacy git_pillar is used, and a notice in the
docs.
 2017-02-07 11:18:28 -07:00
Pedro Algarvio
7ee157174b Gate 3rd-party library imports (#39223) 2017-02-07 10:57:25 -07:00
Mike Place
a80a25af94 Merge pull request #39182 from NerdsvilleCEO/develop 
Fix crashes when source attr is missing, as well as when description is missing
 2017-02-07 10:07:52 -07:00
Mike Place
9863b24136 Merge pull request #39196 from carlpett/patch-3 
Clarify where sdb profiles need to be configured
 2017-02-07 09:45:09 -07:00
Mike Place
19c3d90a32 Merge pull request #39180 from morganwillcock/setup 
setup.py: Remove global options from install command
 2017-02-07 09:20:48 -07:00
Mike Place
df5f934c34 Merge pull request #39199 from rallytime/bp-39170 
Back-port #39170 to 2016.3
 2017-02-07 09:19:31 -07:00
Mike Place
b0036bf34a Merge pull request #39201 from marcaurele/doc/cloudstack 
Doc: add getting started page for CloudStack provider
 2017-02-07 09:17:13 -07:00
Mike Place
2621c119fd Merge pull request #39206 from cachedout/issue_issue_37174 
Ignore empty dicts in highstate outputter
 2017-02-07 09:11:35 -07:00
Mike Place
3edf789122 Merge pull request #39207 from twangboy/win_iis 
Additional functions to win_iis
 2017-02-07 09:10:05 -07:00
Mike Place
dd440452ea Merge pull request #39209 from terminalmage/sorted-envs 
Sort the return list from the fileserver.envs runner
 2017-02-07 09:07:08 -07:00
C. R. Oldham
a0907bc861 Merge pull request #38863 from hujunya/fix_django_auth 
fix django auth not work
 2017-02-07 09:42:59 -06:00
Erik Johnson
da7d3ecec0 Add integration test for wildcard versions 2017-02-07 08:54:26 -06:00
Erik Johnson
18729f3713 Add wildcard versions to Nitrogen release notes 2017-02-07 08:54:26 -06:00
Erik Johnson
9db2601954 Document wildcard versions in pkg.installed docstring 2017-02-07 08:54:26 -06:00
Erik Johnson
765e97a22b pacman: add support for wildcards in package installs 2017-02-07 08:54:26 -06:00
Erik Johnson
87431d0de0 aptpkg: add pkg.list_repo_pkgs function 2017-02-07 08:54:26 -06:00
Erik Johnson
8319539138 Add salt.utils.fnmatch_multiple 2017-02-07 08:54:25 -06:00
Erik Johnson
8bb0e3d7b9 yumpkg.py: add wildcard support to package installs 
This also makes significant changes to the list_repo_pkgs function to
bring it in line with behavior that will be implemented for other pkg
providers.
 2017-02-07 08:54:25 -06:00
Erik Johnson
f2dbff3a55 Better wildcard check 2017-02-07 08:54:25 -06:00
Yaroslav Molochko
be815c3e0b fix proposal for #34438 
wildcard '*' support for pkg version comparison
 2017-02-07 08:54:25 -06:00
Mrten
66a25796a4 remove (?x) modifiers 
at the start of the regex there can be modifiers which also have to be removed, see #39188
 2017-02-07 11:55:51 +01:00
Junya Hu
2a99ff46d3 check if django_auth_path has been in sys.path 2017-02-07 15:08:51 +08:00
vnitinv
e48fff4192 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-07 11:27:43 +05:30
Nitin Kumar
3a578403c1 Merge pull request #9 from spidercensus/develop 
Add optional args from jnpr.junos.Device to proxy module
 2017-02-07 11:14:43 +05:30
Nitin Kumar
49b9f00643 Merge branch 'develop' into develop 2017-02-07 11:14:25 +05:30
Nitin Kumar
9b20979a22 Merge pull request #4 from rajvidhimar/bug-fixes 
Fix install_config
 2017-02-07 11:12:07 +05:30
Erik Johnson
e6dda4a625 Sort the return list from the fileserver.envs runner 2017-02-06 21:30:13 -06:00
Josh Santos
f956f399e9 Change == to is for comparison to None 2017-02-06 22:17:46 -05:00
twangboy
8c73db847e Add start and stop apppool commands 2017-02-06 17:38:38 -07:00
Brian Glogower
519d98d856 Remove unneeded log.error 2017-02-06 16:33:17 -08:00
twangboy
128b0730a1 Add start/stop/restart site, improve docs 2017-02-06 17:30:50 -07:00
rallytime
2f74dcf685 Various doc updates to fix warnings in doc build 2017-02-06 16:56:58 -07:00
Mike Place
be31e0559c
Ignore empty dicts in highstate outputter 
Closes #37174
 2017-02-06 16:25:48 -07:00
Mike Place
113485016e
Revert "Cache the renderer in the pillar" 
This reverts commit bd12f7e269.
 2017-02-06 15:38:36 -07:00
Nicole Thomas
7bed68743e [2016.3] Pylint fix (#39202) 2017-02-06 14:42:30 -07:00
Josh Santos
0a3914a630 Fix lint errors 2017-02-06 16:02:35 -05:00
Nicole Thomas
c3e541e0a2 Merge pull request #39198 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-06 14:01:56 -07:00
Marc-Aurèle Brothier
786948ca98 Doc: add getting started page for CloudStack provider based on Exoscale as an example 
Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
 2017-02-06 21:13:38 +01:00
C. R. Oldham
9d8e72b881 Merge pull request #38339 from cloudflare/STRAIGHT-MINION 
Migrate NAPALM modules to be used in both proxy and regular minion
 2017-02-06 13:41:07 -06:00
Raine Curtis
c129905310 Added missing source_hash_name argument in get_managed function 
Additional fix to  #33187
Customer was still seeing errors, this should now work.
Tested with 2015.8.13 and 2016.11.2
 2017-02-06 12:40:55 -07:00
C. R. Oldham
2a85d73f59 Merge pull request #39063 from cloudflare/ISS-39059 
Avoid KeyError: 'multiprocessing' in the master logs
 2017-02-06 13:37:34 -06:00