valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,594 Commits 24 Branches 182 Tags 341 MiB
5508307a27
Commit Graph

25594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
5508307a27 Merge pull request #10204 from jhenry82/randomize_master_selection 
Randomize master selection
 2014-02-07 14:20:22 -07:00
Joseph Hall
cdc4bc6faf Merge pull request #10274 from kerick/aix-work 
Fix cron module for AIX, Fix set_special documentation
 2014-02-07 14:14:36 -07:00
Jayson Cofell
432d7bc640 Fix cron module for AIX, Fix set_special documentation 2014-02-07 15:03:50 -06:00
David Boucha
e67187ad79 Remove process.join() 
This caused the windows minion to block
 2014-02-07 11:17:46 -07:00
Pedro Algarvio
e2616596a8 Merge pull request #10265 from s0undt3ch/develop 
Some more stalled job tweaks
 2014-02-07 18:02:29 +00:00
Pedro Algarvio
c8010bbf4f We don't narrow check's to state calls no more. 2014-02-07 18:01:09 +00:00
Pedro Algarvio
420fe3cc50 Let's try without passing the --out option. 2014-02-07 18:00:40 +00:00
Pedro Algarvio
b56278f083 Merge pull request #10256 from s0undt3ch/develop 
Use the correct `.format()` index.
 2014-02-07 10:26:31 +00:00
Pedro Algarvio
499a508a0f Use the correct .format() index. 2014-02-07 10:25:27 +00:00
Pedro Algarvio
9be06fe644 Merge pull request #10252 from plastikos/issue-10251 
unit.modules.virtualenv_test.VirtualenvTestCase.test_python_argument
 2014-02-07 01:08:15 +00:00
Pedro Algarvio
82cc018b67 Merge pull request #10253 from terminalmage/10245 
Don't shadow built-in type 'list'
 2014-02-07 01:07:41 +00:00
Erik Johnson
cc577ed6ab Don't shadow built-in type 'list' 2014-02-06 18:37:45 -06:00
Thayne Harbaugh
f9d790a389 unit.modules.virtualenv_test.VirtualenvTestCase.test_python_argument 
work with non-standard interpreter locations

  Fixes #10251
 2014-02-06 17:01:40 -07:00
Joseph Hall
f358199680 Merge pull request #10243 from cedwards/documentation 
some cleanup in the halite tutorial doc
 2014-02-06 13:39:33 -07:00
Pedro Algarvio
3b0b9e2b6a Merge pull request #10240 from cvrebert/patch-1 
rm unused imports of re & fnmatch from file state
 2014-02-06 19:36:22 +00:00
Pedro Algarvio
7185de7b53 Merge pull request #10241 from cvrebert/patch-2 
utils.parsers: rm unused import of yaml
 2014-02-06 19:33:30 +00:00
Pedro Algarvio
ecc4240555 Merge pull request #10236 from s0undt3ch/hotfix/lint 
Fix lint issues
 2014-02-06 19:28:15 +00:00
Christer Edwards
b8d6f9299f some cleanup in the halite tutorial doc 2014-02-06 12:28:14 -07:00
Chris Rebert
41b117f7e7 utils.parsers: rm unused import of yaml 
************* Module salt.utils.parsers
salt/utils/parsers.py:22: [W0611(unused-import), ] Unused import yaml
 2014-02-06 11:27:34 -08:00
Chris Rebert
f830906ade rm unused imports of re & fnmatch from file state 
************* Module salt.states.file
salt/states/file.py:224: [W0611(unused-import), ] Unused import re
salt/states/file.py:225: [W0611(unused-import), ] Unused import fnmatch
 2014-02-06 11:25:49 -08:00
Pedro Algarvio
c8ff6e8a46 Merge pull request #10238 from whiteinge/minion-swarm-custom-user 
Fix minionswarm.py when running as non-root
 2014-02-06 18:04:35 +00:00
Seth House
b336c48b8c Pass the minionswarm user through to salt-key 
Otherwise salt-key would fail with a user warning and not write the key
which would then cause the minionswarm to fail when referencing the key.
 2014-02-06 10:59:34 -07:00
Seth House
d779354351 Moved grabbing/overriding the minionswarm user to parse-time 
This change provides a single source of truth for what user the swam
will be running as.
 2014-02-06 10:59:34 -07:00
Pedro Algarvio
9971fded81 Ignore PyLint's W0232(No __init__ method). 2014-02-06 17:53:30 +00:00
Pedro Algarvio
1887dda401 Fix white-space related lint issue 2014-02-06 17:51:24 +00:00
Pedro Algarvio
424c5ffd95 Fix white-space related lint issue 2014-02-06 17:50:14 +00:00
Jon Henry
cf91e9638d Add random_master minion config option, which will randomize the list of available masters if set to True 2014-02-06 10:17:35 -07:00
Pedro Algarvio
a73f096fbd Merge pull request #10235 from s0undt3ch/develop 
Add missing white-space.
 2014-02-06 16:41:27 +00:00
Pedro Algarvio
30032a9abf Add missing white-space. 2014-02-06 16:36:32 +00:00
Thomas S Hatch
9bd26828b4 Merge pull request #10228 from terminalmage/freebsd_origin_names 
Fix ports.installed state for pkg names that don't match origin
 2014-02-05 22:56:01 -07:00
Erik Johnson
6aa1bd649c freebsdpkg: Add with_origin argument to version() 2014-02-05 23:14:33 -06:00
Erik Johnson
dd986d1e27 pkgng: Add with_origin argument to version() 2014-02-05 23:14:33 -06:00
Erik Johnson
233f08d990 Fix ports.installed state for pkg names that don't match origin 
This fixes a bug where ports.installed states report failure to install,
due to the package name not matching the name of the port. For example,
if installing www/mod_perl2 for use with www/apache22, this results in a
package name of ap22-mod_perl2. The ports.installed state thinks the
install failed because of this package name mismatch.

This fix checks the origin names of installed packages, instead of the
name of the package itself.
 2014-02-05 23:13:54 -06:00
Erik Johnson
49d9a6aa45 freebsdpkg: add with_origin option to list_pkgs() 
This adds a new option to list_pkgs() which, if True, will return a more
complex data structure containing both the origin and version for each
package.
 2014-02-05 22:45:48 -06:00
Erik Johnson
b151641445 pkgng: add with_origin option to list_pkgs() 
This adds a new option to list_pkgs() which, if True, will return a more
complex data structure containing both the origin and version for each
package.
 2014-02-05 22:45:48 -06:00
Thomas S Hatch
1c2b7d7a86 lint fix 2014-02-05 21:23:27 -07:00
Thomas S Hatch
a089a60f07 lint fixes 2014-02-05 21:21:56 -07:00
Thomas S Hatch
eb302cbbb3 Lint fix 2014-02-05 21:18:17 -07:00
Thomas S Hatch
7521350810 Merge pull request #10224 from Stelminator/packaging 
add missing modules in setup.py
 2014-02-05 21:10:46 -07:00
Thomas S Hatch
285da24500 Merge pull request #10221 from whiteinge/salt-call-local-opts 
Salt call local opts
 2014-02-05 21:09:21 -07:00
Thomas S Hatch
876b760a36 Merge pull request #10213 from s0undt3ch/develop 
Fix `aptpkg` referencess.
 2014-02-05 21:06:16 -07:00
Thomas S Hatch
3c03ac48f7 Merge pull request #10211 from codekoala/carbon-pillar 
Carbon config from the pillar
 2014-02-05 21:05:30 -07:00
Thomas S Hatch
a3516ed8b3 Merge pull request #10210 from mgwilliams/lxc 
lxc runner: use kwargs instead of string'd args
 2014-02-05 21:04:51 -07:00
Thomas S Hatch
8d2938e3f0 Merge pull request #10208 from cachedout/permissions-exception-handling 
File perms exception handling
 2014-02-05 21:04:33 -07:00
Thomas S Hatch
30d581c974 Merge pull request #10203 from jhenry82/auth_timeout_config 
Auth timeout config
 2014-02-05 20:59:36 -07:00
Erik Johnson
7cf146f5ea Add versionadded directives for cp.cache_dir 
This adds documentation for new parameters, and also notes when they
were added.
 2014-02-05 20:56:10 -06:00
Thomas S Hatch
e8f82fa36f Merge pull request #10194 from terminalmage/10160 
Sync only *.py, *.pyx, *.so in saltutil.sync_*
 2014-02-05 19:43:32 -07:00
Joseph Hall
74abdb2129 Merge pull request #10226 from levigross/develop 
Removed extra indent to allow the function to return false if an IP is not able to be converted
 2014-02-05 19:30:49 -07:00
Levi Gross
0f58bc9f3d Removed extra indent to allow the function to return false if an IP is not able to be converted 2014-02-05 21:25:56 -05:00
Joseph Hall
fc5418adcc Merge pull request #10225 from levigross/develop 
Removed extra indent to allow the function to return false if an IP is not able to be converted
 2014-02-05 19:06:08 -07:00