valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
58,170 Commits 24 Branches 182 Tags 341 MiB
947ed5f739
Commit Graph

58170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
947ed5f739 Clarify docstring 2015-10-08 17:22:25 -05:00
Colton Myers
82a51cebde Merge pull request #27760 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-10-07 13:11:17 -06:00
Colton Myers
35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/man/salt-api.1
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt-key.1
    doc/man/salt-master.1
    doc/man/salt-minion.1
    doc/man/salt-run.1
    doc/man/salt-ssh.1
    doc/man/salt-syndic.1
    doc/man/salt-unity.1
    doc/man/salt.1
    doc/man/salt.7
    salt/modules/pip.py
    salt/states/user.py
 2015-10-07 12:06:12 -06:00
Colton Myers
b2937b6a16 Merge pull request #27759 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-10-07 12:01:54 -06:00
Colton Myers
792ee084bb Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-10-07 12:00:53 -06:00
Justin Findlay
aced4229cb Merge pull request #27757 from jfindlay/virtret 
fix virtual fcn return doc indentation
 2015-10-07 11:50:18 -06:00
Justin Findlay
03400ef45b fix virtual fcn return doc indentation 
Fixes #27724.
 2015-10-07 11:49:16 -06:00
Justin Findlay
4b9128b491 Merge pull request #27732 from jacobhammons/26673 
update docs for __virtual__ and __virtualname__
 2015-10-07 11:29:31 -06:00
Nicole Thomas
a130896d1c Merge pull request #27747 from Sacro/fix-chocolatey-version 
Chocolatey doesn't have a help command.
 2015-10-07 10:06:53 -06:00
Nicole Thomas
57b5b594bd Merge pull request #27754 from rallytime/fix-27636 
Change test.nop version directive to 2015.8.1
 2015-10-07 09:59:55 -06:00
rallytime
31b9852d9a Change test.nop version directive to 2015.8.1 
Fixes #27636
 2015-10-07 09:57:01 -06:00
Jacob Hammons
75cc07cf10 noted that __virtual__ can return False and an error string 2015-10-07 09:48:46 -06:00
Ben Woodward
8f1fa9e78e Chocolatey doesn't have a help command. 2015-10-07 13:44:51 +01:00
jacobhammons
4e48651de0 Merge pull request #27733 from jacobhammons/bug-fixes 
hardening topic - updates to docs.saltstack.com theme
 2015-10-06 19:44:00 -06:00
jacobhammons
9a0171089d Merge pull request #27734 from jacobhammons/theme-updates 
Updated saltstack2 theme to add SaltConf16 banner
 2015-10-06 19:43:53 -06:00
Jacob Hammons
3a52d3606b Updated saltstack2 theme to add SaltConf16 banner 2015-10-06 17:42:53 -06:00
Jacob Hammons
cbecd4f553 Updated saltstack2 theme to add SaltConf16 banner 2015-10-06 17:38:49 -06:00
Jacob Hammons
117e0c2bcc Added hardening topic based on the information in Refs #27088 2015-10-06 17:36:54 -06:00
Jacob Hammons
b928e1afa8 update docs for __virtual__ and __virtualname__ 
Refs #26673
 2015-10-06 17:23:42 -06:00
Nicole Thomas
d3f2dfe835 Merge pull request #27727 from rallytime/merge-27719 
Merge #27719 w/pylint fix
 2015-10-06 15:13:37 -06:00
rallytime
a7fd156162 Pylint 2015-10-06 15:12:27 -06:00
Nicole Thomas
f26bcd2d21 Merge pull request #27724 from jfindlay/virtret 
update __virtual__ return documentation
 2015-10-06 15:06:46 -06:00
Colton Myers
d67e8c5c2c Merge pull request #27725 from basepi/states.cross.call.27481 
Fix global injection for state cross calls
 2015-10-06 15:02:14 -06:00
Colton Myers
e12269d871 Remove unused import 2015-10-06 14:10:55 -06:00
Justin Findlay
6bddf80546 update __virtual__ return documentation 
Related to #26755; fixes #27116; implements part of #27643.
 2015-10-06 13:47:31 -06:00
Colton Myers
4e6505b2e7 Return the wrapper (whoops) 2015-10-06 13:44:55 -06:00
Justin Findlay
6bf2ee2751 tell user when x509 exec/state module can't load 
Fixes #27595.
 2015-10-06 12:46:35 -06:00
Erik Johnson
06e67d25f8 Merge pull request #27628 from ticosax/dockerng-container-label 
[dockerng] Add support of `labels` parameter for dockerng
 2015-10-06 08:58:40 -05:00
Nicolas Delaby
edf625c8b4 Add support of labels parameter for dockerng 2015-10-06 13:18:05 +02:00
Nicole Thomas
e47d849af6 Merge pull request #27704 from jacobhammons/26604 
Update compound matcher docs to clarify the usage of alternate delimi…
 2015-10-05 23:36:55 -06:00
Nicole Thomas
c58da846bf Merge pull request #27706 from jacobhammons/bug-fixes 
Assorted doc bugs
 2015-10-05 23:35:29 -06:00
Jacob Hammons
76dc8de71b Assorted doc bugs 
Refs #9051
Refs #13407
Refs #21475
Refs #14876
Refs #27005
 2015-10-05 17:37:13 -06:00
Nicole Thomas
2491ce40f1 Merge pull request #27705 from rallytime/merge-27602 
Merge #27602 with final pylint fix
 2015-10-05 17:36:50 -06:00
rallytime
81aad83386 Ignore import error 2015-10-05 17:35:31 -06:00
Jacob Hammons
1c51ce28a9 Update compound matcher docs to clarify the usage of alternate delimiters 
Refs #26604
 2015-10-05 17:29:39 -06:00
Colton Myers
fadb954676 Use new method for injecting globals into state functions 2015-10-05 17:07:45 -06:00
Colton Myers
17b267470a Add decorator for injecting globals into functions in the loader 
Override LazyLoader __getitem__ to wrap the function if globals are
defined for wrapping
 2015-10-05 17:06:40 -06:00
Joseph Hall
b76eb08c68 Merge pull request #27691 from notpeter/iam_fail_faster 
Faster timeout (3s vs 2min) for instance metadata lookups. #13850.
 2015-10-05 16:55:52 -06:00
C. R. Oldham
fc78f49dc5 Merge pull request #27696 from blueyed/load-proxy-call-_module_dirs-only-once 
loader.proxy: call `_modules_dirs` only once
 2015-10-05 16:42:32 -06:00
Daniel Hahler
561dc4cf94 dockerng: fix/enhance version warning in __virtual__ 
Currently the call to `log.warning` will throw an error, because
`str.join` expects strings, not numbers.

This commit fixes it and also handles a mismatching docker-py version
more appropriate by returning a tuple instead of logging warnings
(hinted via https://github.com/saltstack/salt/pull/27602#discussion_r41057751).
 2015-10-06 00:20:26 +02:00
Colton Myers
43fba89865 Merge pull request #27695 from rallytime/bp-27671 
Back-port #27671 to 2015.5
 2015-10-05 15:57:36 -06:00
Colton Myers
77516912fa Merge pull request #27630 from ticosax/include-container-id-docker-mine 
Expose container_id in mine.get_docker
 2015-10-05 15:56:53 -06:00
Colton Myers
8453cb3eb1 Merge pull request #27600 from blueyed/dockerng-auto-version 
dockerng: use docker.version=auto by default
 2015-10-05 15:29:14 -06:00
Colton Myers
cb3d92676e Merge pull request #27524 from jfindlay/pkgng_quiet 
parse pkgng output in quiet mode for >= 1.6.1
 2015-10-05 15:22:40 -06:00
Colton Myers
5b88c55cc3 Merge pull request #27686 from rallytime/bp-27476 
Back-port #27476 to 2015.5
 2015-10-05 15:17:59 -06:00
Colton Myers
f9ddd4647f Merge pull request #27684 from rallytime/bp-27656 
Back-port #27656 to 2015.5
 2015-10-05 15:17:55 -06:00
Colton Myers
7a4291008e Merge pull request #27689 from rallytime/fix-tests-27448 
Merge #27448 with test fixes
 2015-10-05 15:17:41 -06:00
Colton Myers
7ca6f854ff Merge pull request #27683 from rallytime/bp-27659 
Back-port #27659 to 2015.5
 2015-10-05 15:17:30 -06:00
Colton Myers
a0f3e34656 Merge pull request #27682 from rallytime/bp-27566 
Back-port #27566 to 2015.5
 2015-10-05 15:17:26 -06:00
Colton Myers
0b9ba911c4 Merge pull request #27681 from rallytime/bp-25928 
Back-port #25928 to 2015.5
 2015-10-05 15:17:19 -06:00