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
10,908 Commits 24 Branches 182 Tags 341 MiB
da9243b2dd
Commit Graph

10908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
da9243b2dd Merge pull request #3771 from s0undt3ch/hotfix/use-module-__all__-in-loader 
Use `__all__` when loading modules(if provided).
 2013-02-19 09:49:48 -08:00
Thomas S Hatch
5870f53ba8 Merge pull request #3787 from s0undt3ch/issues/2563 
Re-apply 3055916b5d correcting the copy/paste error. Refs #2563.
 2013-02-19 08:35:16 -08:00
Pedro Algarvio
41212b7deb Some more mirror support to travis.yaml pip install calls. 2013-02-19 16:10:59 +00:00
Thomas S Hatch
c21419d0fd Merge pull request #3786 from UtahDave/win_pkg_fixes 
Sort packages before returning
 2013-02-19 07:19:54 -08:00
Pedro Algarvio
e79e4f27f6 Besides loading module functions from __load__ we also log that information. 
This will allow us to debug any bug reports stating that the function X is not loading(because they did not add it to an existing `__load__`).
 2013-02-19 09:02:25 +00:00
Pedro Algarvio
cb662dcb47 Merge branch 'develop' of github.com:saltstack/salt into hotfix/use-module-__all__-in-loader 2013-02-19 08:42:46 +00:00
Pedro Algarvio
92da051c00 Re-apply 3055916b5d correcting the copy/paste error. Refs #2563. 
We should now provide the configuration filename to load configurations from at the parser's class level.
The calls to `ConfigDirMixIn.get_config_file_path()` still accept a filename, though, if that filename is `None`(the default), it grabs the filename from the class level attribute `_config_filename_`.
 2013-02-19 08:35:06 +00:00
David Boucha
bfa9efc950 Sort packages before returning 2013-02-18 21:34:56 -07:00
Thomas S Hatch
c6407e7bd5 Merge pull request #3785 from UtahDave/use_winapi-please 
win_pkg should use pkg_resource.add_pkg
 2013-02-18 19:06:21 -08:00
David Boucha
2bc84bd6b5 Don't forget function parens 2013-02-18 18:33:36 -07:00
David Boucha
19d9c9126d proper use of add_pkg 2013-02-18 18:26:46 -07:00
Colton Myers
a2826be90c Fix a pep8 line length issue 2013-02-18 17:48:11 -07:00
David Boucha
211997bef4 Create pkg list with pkg_resource.add_pkg 2013-02-18 17:47:26 -07:00
David Boucha
0026713d08 move dict definition outside loop 2013-02-18 17:40:50 -07:00
Thomas S Hatch
7eeacfbd69 Merge pull request #3783 from UtahDave/use_winapi-please 
Use salt.utils.winapi.Com instead of manually running the pythoncom stuff
 2013-02-18 16:39:42 -08:00
Thomas S Hatch
6865b8f0ec Merge pull request #3784 from basepi/autherrorfix 
Fixes #3760 Fix to properly print errors from cli.run()
 2013-02-18 16:39:12 -08:00
Colton Myers
aa9327fc5a Fix to properly print errors from cli.run() 2013-02-18 17:35:35 -07:00
Thomas S Hatch
14fd554f41 Add check if bad fileserver backend is specified 2013-02-18 17:16:41 -07:00
Pedro Algarvio
7173454233 To avoid any future confusion, we'll use __load__ instead of __all__. 2013-02-18 23:57:27 +00:00
David Boucha
2e942c821c Use salt.utils.winapi.Com instead of manually 2013-02-18 16:50:22 -07:00
Thomas S Hatch
fa787918c8 Fix minor spelling issue 2013-02-18 15:04:43 -07:00
Thomas S Hatch
59efa4ee2e Merge pull request #3779 from basepi/nominions 
Fix errors in Pull Request #3777
 2013-02-18 13:47:45 -08:00
Thomas S Hatch
19648ed91a Revert "Allow specifying the configuration file name at the parser's class level. Refs #2563." 
This reverts commit 3055916b5d.
 2013-02-18 14:40:14 -07:00
Colton Myers
589bcf7145 Move the no minion check so it doesn't eclipse no master check 2013-02-18 14:39:32 -07:00
Colton Myers
51cab9055f Add 'jid' back in as None to prevent KeyErrors 2013-02-18 14:39:18 -07:00
Thomas S Hatch
84ca62555e Merge pull request #3777 from basepi/nominions 
Fixes #3737 Print messages for no master or no matching minions
 2013-02-18 12:54:53 -08:00
David Boucha
7a3c87c5b0 Merge pull request #3778 from basepi/isnonefix 
Fix for `is True` and `is None` instead of `==`
 2013-02-18 10:52:01 -08:00
Colton Myers
399648e5e0 Fix for is True and is None instead of == 2013-02-18 11:50:24 -07:00
Colton Myers
fd2750345f Don't assign 'jid' if no minions match 2013-02-18 11:42:40 -07:00
Colton Myers
e8d7d8cdc6 Update client.py to check for no matching minions 2013-02-18 11:40:18 -07:00
Colton Myers
b22a7eb6c8 Update publish() in master.py to not publish if no minions matched 2013-02-18 11:40:18 -07:00
Colton Myers
c415ddf9fd Fix print statement for PEP8 line length 2013-02-18 11:40:18 -07:00
Colton Myers
f0c12f2f26 Print 'failed to connect' on salt commands if no master 2013-02-18 11:40:18 -07:00
Colton Myers
c92e2f3373 Fix typo in validate_tgt docstring 2013-02-18 11:40:18 -07:00
Thomas S Hatch
fff07a3fc0 Merge pull request #3768 from ydavid365/grains-state-doc 
added grains state module to docs
 2013-02-18 09:11:02 -08:00
Thomas S Hatch
0cb13d8cb7 Merge pull request #3767 from ydavid365/grains-state 
added grains state instructions
 2013-02-18 09:10:38 -08:00
Thomas S Hatch
5f02401e1e Merge pull request #3766 from ydavid365/module-sp 
module sp
 2013-02-18 09:09:52 -08:00
Thomas S Hatch
ba91987a94 Merge pull request #3765 from ydavid365/2013 
2013
 2013-02-18 09:07:43 -08:00
Thomas S Hatch
de462594e9 Merge pull request #3775 from s0undt3ch/hotfix/loader-virtual-true-same-name 
Fix modules returning `True` in `__virtual__` getting renamed.
 2013-02-18 09:01:39 -08:00
Thomas S Hatch
56b573d786 Merge pull request #3774 from s0undt3ch/issues/3189 
Allow failing on `getpass.getuser()`. Refs #3189.
 2013-02-18 08:59:53 -08:00
Thomas S Hatch
53a92f444c Merge pull request #3773 from giantlock/develop 
fix file.recurse state bug
 2013-02-18 08:57:46 -08:00
Thomas S Hatch
ea230077b5 Merge pull request #3772 from s0undt3ch/issues/2563 
Allow specifying the configuration file name at the parser's class level.
 2013-02-18 08:57:02 -08:00
Thomas S Hatch
c28dd8cff6 Merge pull request #3770 from hvnsweeting/develop 
fixbug on `extend` example
 2013-02-18 08:53:06 -08:00
Pedro Algarvio
163999a74d Fix modules returning True in __virtual__ getting renamed to True instead of keeping the same name. 2013-02-18 15:53:15 +00:00
Pedro Algarvio
99bc008bc0 Allow failing on getpass.getuser(). Refs #3189. 
Log as debug on windows, and as an error otherwise.
 2013-02-18 13:58:04 +00:00
Denis Generalov
2dac284c66 * fix bug: file.recurse state shoud treat source as dir 
* 2 cents optimization: evaluate srcpath one time
 2013-02-18 17:20:50 +04:00
Pedro Algarvio
3055916b5d Allow specifying the configuration file name at the parser's class level. Refs #2563. 
We should now provide the configuration filename to load configurations from at the parser's class level.
The calls to `ConfigDirMixIn.get_config_file_path()` still accept a filename, though, if that filename is `None`(the default), it grabs the filename from the class level attribute `_config_filename_`.
 2013-02-18 12:51:55 +00:00
Pedro Algarvio
3edd841b33 Remove forgotten ). Minor PEP8. 2013-02-18 12:30:04 +00:00
Pedro Algarvio
310f40d114 Use __all__ when loading modules(if provided). 
* When loading the module's functions, if the module provides `__all__`, that's what's iterated.
* If a function provided in `__all__` starts with `_` it's not skipped because the module explicitly provided it.
* Minor formatting in the logging messages.
 2013-02-18 12:16:18 +00:00
HVN
c66201898c fixbug on extend example 2013-02-18 15:47:00 +07:00