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
34,745 Commits 24 Branches 182 Tags 341 MiB
fbf98c8655
Commit Graph

34745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. R. Oldham
fbf98c8655 Merge pull request #15006 from basepi/2014.1.10release 
Release 2014.1.10
 2014-08-14 17:38:00 -06:00
Colton Myers
8c7d1132c8 Add security advisory to release notes for 2014.1.10 2014-08-14 17:35:27 -06:00
Colton Myers
24c13abc4e Bump doc version 2014-08-14 17:33:04 -06:00
Nicole Thomas
548714fb21 Merge pull request #14994 from saltstack/bp-14990 
Backport #14990 to 2014.7
 2014-08-14 13:47:25 -06:00
rallytime
7f170c126f Remove 'RC1' from GIT_VERSION comparison 2014-08-14 11:06:18 -06:00
rallytime
fe5b8d22ec Fix gitpillar skipIfs 2014-08-14 10:34:38 -06:00
Thomas S Hatch
2d0d6b508e Merge pull request #14973 from thatch45/2014.7 
Better approach to #14955
 2014-08-13 17:01:43 -06:00
Thomas S Hatch
c2d2ed68ea Merge pull request #14971 from whiteinge/doc-names-override 
Documented the expansion additon to names
 2014-08-13 16:54:53 -06:00
Thomas S Hatch
a0d7163abb Merge pull request #14967 from rallytime/pillar_tests 
Add skipIfs to pillar tests if GitPillar 0.3.2rc1 or > isn't installed
 2014-08-13 16:53:56 -06:00
Thomas S Hatch
3d32a1cb8d Merge pull request #14964 from whiteinge/salt-npm-env 
Add env support to npm
 2014-08-13 16:48:56 -06:00
Thomas S Hatch
90cd112931 Better approach to #14955 
We can just detect if the function is there, so that we on;y need
to add it if the kwargs do need to be massaged.
 2014-08-13 16:46:04 -06:00
Thomas S Hatch
adcb67b93b Merge pull request #14955 from mcalmer/zypper-add-expand_repo_def 
add expand_repo_def needed by states pkgrepo.managed
 2014-08-13 16:43:32 -06:00
Seth House
d85791e3ef Documented the expansion additon to names 
Added docs for the addition in #13489.
 2014-08-13 18:19:02 -04:00
Thomas S Hatch
cfdaba5a62 Merge pull request #14935 from whiteinge/salt-orchestrate-event 
Added wait_for_event function to saltmod
 2014-08-13 16:05:36 -06:00
Thomas S Hatch
48da5f486d Merge pull request #14969 from thatch45/2014.7 
Add template files to manifest so they get included
 2014-08-13 15:45:34 -06:00
Thomas S Hatch
b755ed1c84 Add template files to manifest so they get included 
in python 2.6 builds because package_data was changed in 2.7
 2014-08-13 15:44:25 -06:00
rallytime
496cfe25b3 Add skipIfs to ext_pillar tests if GitPillar 0.3.2rc1 or > isn't installed 2014-08-13 14:14:53 -06:00
Seth House
8f8cb959e0 Also pass runas and env through to npm.list 2014-08-13 15:34:30 -04:00
Seth House
aafc061e26 Added an env arg to npm module & state 
Because npm can be configured using env vars.
 2014-08-13 13:45:42 -04:00
Thomas S Hatch
2aa208f636 Merge pull request #14930 from whiteinge/doc-event-fire_master_env-sudo 
Update event.fire_master_env docstring with sudo instructions
 2014-08-13 10:38:39 -06:00
Thomas S Hatch
80a7c85b03 Merge pull request #14901 from Nibbler999/fix-custom-grains-override 
Fix custom grains override
 2014-08-13 10:35:26 -06:00
Colton Myers
6e3a83fbad Merge pull request #14931 from basepi/rcdocs 
Add installation docs for Salt release candidate
 2014-08-13 10:25:23 -06:00
Thomas S Hatch
35b654c2c5 Merge pull request #14942 from UtahDave/2014.7temp 
Fix unicode output error on Windows salt-call
 2014-08-13 09:54:38 -06:00
Joseph Hall
6a0bfbf11f Merge pull request #14959 from s0undt3ch/2014.7 
Remove unused imports and fix white-space lint issues.
 2014-08-13 09:43:29 -06:00
Pedro Algarvio
c3b064b717 Remove unused imports and fix white-space lint issues. 2014-08-13 16:42:36 +01:00
Michael Calmer
97b2292831 fix pylint add extra line 2014-08-13 15:59:15 +02:00
Michael Calmer
184bf5f881 add expand_repo_def needed by states pkgrepo.managed 2014-08-13 15:14:28 +02:00
Joseph Hall
25352b93a9 Merge pull request #14954 from mcalmer/fix-zypper-set-autorefresh 
fix set autorefresh in zypper module
 2014-08-13 07:10:59 -06:00
Michael Calmer
fd8f0370bf fix set autorefresh in zypper module 
fix:
"Failed to configure repo '<reponame>': in method
'RepoInfoBase_setAlias', argument 2 of type 'std::string const &'"
 2014-08-13 14:59:29 +02:00
Thomas S Hatch
d13ae8c626 Merge pull request #14949 from cro/fileclient_extnodes 
Ensure external nodes no longer referenced even though it could not be used for evil.
 2014-08-12 19:16:15 -06:00
C. R. Oldham
b116d09423 Ensure external_nodes is no longer referenced even though it could not be used for evil. 2014-08-12 19:10:32 -06:00
C. R. Oldham
ef8e23906f Merge pull request #14945 from cro/ldap_metacharacters6 
Pylint fix.
 2014-08-12 18:47:25 -06:00
C. R. Oldham
19c8866976 PyLint fix. 2014-08-12 18:46:42 -06:00
Thomas S Hatch
73d3ba3fa8 Merge pull request #14944 from cro/ldap_metacharacters6 
Ensure ldap characters are properly escaped
 2014-08-12 18:35:26 -06:00
C. R. Oldham
c3cd30756c Ensure external_nodes is no longer referenced even though it could not be used for evil. 2014-08-12 18:28:16 -06:00
C. R. Oldham
4563b26b5c Ensure ldap parameters are properly escaped 2014-08-12 18:04:38 -06:00
David Boucha
1e2846551d Fix unicode output error on Windows salt-call 
Fixes #14695
 2014-08-12 17:08:53 -06:00
Seth House
ac41a4a9dc Added wait_for_event function to saltmod 
This allows the orchestrate system to watch the event bus for arbitrary
events.
 2014-08-12 18:15:32 -04:00
Colton Myers
788ed4606f Reword some things 2014-08-12 15:08:02 -06:00
Colton Myers
51917ee017 Add installation docs for Salt release candidate 2014-08-12 14:53:21 -06:00
Seth House
f15071ec5f Update event.fire_master_env docstring with sudo instructions 2014-08-12 16:43:28 -04:00
Colton Myers
5221be7029 Merge pull request #14929 from cachedout/fix_14099 
Guh. Typoed earlier and forgot to remove.
 2014-08-12 14:08:08 -06:00
Mike Place
2643c9f345 Guh. Typoed earlier and forgot to remove. 2014-08-12 14:06:48 -06:00
Thomas S Hatch
06cff4bb18 Merge pull request #14905 from UtahDave/update_esky 
Fix esky updates
 2014-08-12 11:46:40 -06:00
Thomas S Hatch
a6f21e140a Merge pull request #14904 from cachedout/fix_14099 
Continue if master in multi-master is down
 2014-08-12 11:46:01 -06:00
Thomas S Hatch
1a5c0c5dca Merge pull request #14895 from whiteinge/npm-cleanup 
Fix npm test; npm state pylint fix
 2014-08-12 11:44:42 -06:00
Thomas S Hatch
4a0f0cfdc1 Merge pull request #14922 from thatch45/2014.7 
update raet install docs for 2014.7
 2014-08-12 11:25:41 -06:00
Thomas S Hatch
05f4d0f7a8 update raet install docs for 2014.7 2014-08-12 11:16:53 -06:00
David Boucha
635a82d957 Fix esky updates 2014-08-11 19:13:18 -06:00
Thomas S Hatch
1930852c9f Merge pull request #14910 from thatch45/2014.7 
No pending arg exists anymore
 2014-08-11 17:40:26 -06:00