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
34,620 Commits 24 Branches 182 Tags 341 MiB
574a9d10b8
Commit Graph

34620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
574a9d10b8 Rename misspelled CLI argument 2014-08-08 12:54:02 -05:00
Erik Johnson
6a3c290325 Rename misspelled CLI argument 2014-08-08 12:54:02 -05:00
Erik Johnson
7240fcae53 salt.modules.match: Deprecate the "delim" argument 
This is being replaced by "delimiter" to make it more user-friendly.
 2014-08-08 12:50:26 -05:00
Erik Johnson
8c126f6b13 rename "delim" argument to "delimiter" 2014-08-08 12:29:26 -05:00
Erik Johnson
6943f97e3c rename "delim" argument to "delimiter" 2014-08-08 12:29:26 -05:00
Thomas S Hatch
82957bb5cc Merge pull request #14842 from s0undt3ch/hotfix/manage.version 
Skip tests if real mock library is not available
 2014-08-08 09:24:41 -06:00
Pedro Algarvio
c9be462f00 Skip tests if real mock library is not available 2014-08-08 00:52:47 +01:00
Pedro Algarvio
a399e62ca2 Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Pedro Algarvio
97f1b00818 Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Pedro Algarvio
faf3157637 Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Pedro Algarvio
21141af46a Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Pedro Algarvio
239b2480ae Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Thomas S Hatch
ae19770a23 Merge pull request #14833 from whiteinge/salt-saltsh-checks 
Minor checks to the saltsh.py repl
 2014-08-07 15:52:29 -06:00
Colton Myers
d99440e6c9 Merge pull request #14823 from cachedout/tty_move 
Tty move
 2014-08-07 14:24:28 -06:00
Colton Myers
989158badc Merge pull request #14830 from UtahDave/2014.7new 
Don't try to get a hash of a directory
 2014-08-07 13:16:00 -06:00
Thomas S Hatch
ebe3d43f24 Merge pull request #14798 from whiteinge/npm-list-ignore-warnings 
Use the silent option when listing npm packages
 2014-08-07 12:24:43 -06:00
Thomas S Hatch
e17ca37530 Merge pull request #14796 from whiteinge/salt-event-fire_master_env 
Added function to fire event using env vars for event data
 2014-08-07 12:24:31 -06:00
Seth House
429cc40376 Minor checks to the saltsh.py repl 2014-08-07 14:24:30 -04:00
Thomas S Hatch
5b0b410d0f Merge pull request #14790 from whiteinge/doc-formulas-update 
Misc cleanups, clarifications, and additions to the formulas conventions doc
 2014-08-07 12:23:37 -06:00
Erik Johnson
ec43a24d67 Merge pull request #14822 from whiteinge/salt-npm-pkgs 
Added pkgs support to the npm module/state
 2014-08-07 12:50:30 -05:00
David Boucha
6b0c5f2e01 Don't try to get a hash of a directory 2014-08-07 11:50:00 -06:00
Thomas S Hatch
41c5d7f80b Merge pull request #14828 from thatch45/2014.7 
lint fix
 2014-08-07 11:45:28 -06:00
Thomas S Hatch
b468b7bd33 lint fix 2014-08-07 11:44:52 -06:00
Thomas S Hatch
8b5a3c9eca Merge pull request #14807 from thatch45/2014.7 
Properly catch the crypt import @gtmanfred
 2014-08-07 11:44:38 -06:00
Mike Place
c3b476a6c0 Grr, typo 2014-08-07 11:37:06 -06:00
Mike Place
fbbfb44642 More lint and doc strings for test 2014-08-07 11:32:55 -06:00
Colton Myers
ce06161326 Merge pull request #14810 from terminalmage/issue14789 
Move --plugins to within _repoquery()
 2014-08-07 11:18:21 -06:00
Colton Myers
eed5339bea Merge pull request #14818 from s0undt3ch/hotfix/manage.version 
Reduce conversions and parsing
 2014-08-07 11:07:01 -06:00
Mike Place
ab37e99b9d Pylint 2014-08-07 10:57:08 -06:00
Mike Place
0d3b6b14d4 Return plain error string in old func 2014-08-07 10:47:24 -06:00
Mike Place
72ba8a377f Moving tty function over to cmdmod 2014-08-07 10:40:16 -06:00
Seth House
ed4bb5119e Added pkgs support to the npm module/state 2014-08-07 12:36:39 -04:00
Erik Johnson
fef4c52bc0 Add plugins to group_info() repoquery calls 
The calls here do not use the _repoquery() helper function and need to
have --plugins added to them.
 2014-08-07 10:47:33 -05:00
Pedro Algarvio
3cf66d4a80 Reduce conversions and parsing 2014-08-07 14:18:04 +01:00
Erik Johnson
80cd5f78b0 Move --plugins to within _repoquery() 
This ensures that all repoquery commands use --plugins. Fixes #14789.
 2014-08-06 19:03:04 -05:00
Colton Myers
ca30b7783c Merge pull request #14805 from basepi/manageversions14788 
Fix manage.versions version comparison
 2014-08-06 17:07:51 -06:00
Thomas S Hatch
58e415df02 Properly catch the crypt import @gtmanfred 2014-08-06 16:14:50 -06:00
Colton Myers
ce4d20cf52 Merge pull request #14804 from saltstack/bp-14694 
Backport #14694 to 2014.7
 2014-08-06 16:08:53 -06:00
Colton Myers
0e3ef915a5 Merge pull request #14803 from saltstack/bp-14774 
Backport #14774 to 2014.7
 2014-08-06 15:55:29 -06:00
Colton Myers
8ec30ac5a0 Use the master_version object to make sure formatting matches 2014-08-06 15:53:36 -06:00
Colton Myers
51356c405b Fix display of minion versions 2014-08-06 15:52:01 -06:00
Colton Myers
41b5f50d4d Fix manage.versions runner to use salt's version parser 
Fixes #14788
 2014-08-06 15:46:09 -06:00
Alexandre Garnier
324d8d83e3 Improve user.getent on Windows 
- Call `user.list_users` instead of duplicating the behavior
 - Get 'uid' directly from `user.version` result
 2014-08-06 15:33:53 -06:00
Alexandre Garnier
90c6162e7e Improve user.info output on Windows 
- Add 'uid' information
 - Use it to get userprofile from registry
 - Fallback 'home' to 'profile' if not set
 2014-08-06 15:33:53 -06:00
Alexandre Garnier
26fd2b3376 Use win32 API to get user info in user.info 
Issue #14679: Calling `net user <name>` and parsing it is broken
on non-English Windows because the output is i18nized.
 2014-08-06 15:33:53 -06:00
Alexandre Garnier
46619672aa Simplify user.list_users on Windows 
- 'None' is simplier than 'localhost' and coherent with `module.win_file`
 - Level 0 is enough as we just need the username
 - Remove useless log
 2014-08-06 15:33:53 -06:00
Daniel Wallace
892c25167f Dont set upstream if ref is HEAD 
If the ref is HEAD, the we should be in a detached HEAD, and thus don't
have a remote, so there is no point in setting this.
 2014-08-06 15:04:00 -06:00
Daniel Wallace
2824e07f5c expect head instead of an empty string branches 
If the branch is detached, git rev-parse will return HEAD, instead of an
empty string.
 2014-08-06 15:04:00 -06:00
Daniel Wallace
dba8cb6148 remove grep and use rev-parse 2014-08-06 15:04:00 -06:00
Colton Myers
e2488e1969 Merge pull request #14800 from saltstack/bp-14773 
Backport #14773 to 2014.7
 2014-08-06 12:49:38 -06:00