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
58,101 Commits 24 Branches 182 Tags 341 MiB
03400ef45b
Commit Graph

58101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
03400ef45b fix virtual fcn return doc indentation 
Fixes #27724.
 2015-10-07 11:49:16 -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
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
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
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
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
7a4291008e Merge pull request #27689 from rallytime/fix-tests-27448 
Merge #27448 with test fixes
 2015-10-05 15:17:41 -06:00
Daniel Hahler
55a76be6c1 loader.proxy: call _modules_dirs only once 
Instead of assigning it to an unused variable, pass the function's
return value to LazyLoader directly.
 2015-10-05 23:07:40 +02:00
Nicole Thomas
4ddc87157a Merge pull request #27693 from jacobhammons/doc-updates 
initial engines topic, updates to windows repo docs
 2015-10-05 15:05:26 -06:00
Jacob Hammons
5a3e72fc8e __ops__ to __opts__ 2015-10-05 15:00:56 -06:00
Nicole Thomas
f7f48d1eef Merge pull request #27601 from blueyed/dockerng-none-names 
dockerng: handle None in container.Names
 2015-10-05 14:32:19 -06:00
Jacob Hammons
5a9867aad1 initial engines topic, updates to windows repo docs 
Refs #23239
Refs #27520
 2015-10-05 14:22:59 -06:00
Erik Johnson
3ffb5a3369 Merge pull request #27596 from blueyed/fix-gitfs-UnboundLocalError 
gitfs: fix UnboundLocalError for 'msg'
 2015-10-05 15:18:00 -05:00
rallytime
05a506ec9f Use correct comment in test 2015-10-05 14:02:13 -06:00
Peter Tripp
3d9483b4e2 Faster timeout (3s vs 2min) for instance metadata lookups. #13850. 2015-10-05 12:17:59 -07:00
rallytime
8296fefb31 Merge #27448 with test fixes 2015-10-05 12:33:03 -06:00
Nicole Thomas
4d7be3f972 Merge pull request #27651 from eliasp/2015.8-cloud.clouds.ec2-check-for-subnetId-before-using-it 
Check for existence of 'subnetId' key in subnet dict
 2015-10-05 11:01:33 -06:00
C. R. Oldham
d9266505a7 Merge pull request #27639 from rallytime/fix-23370 
Docement version added for new artifactory options
 2015-10-05 11:01:21 -06:00
Nicole Thomas
771e5136f1 Merge pull request #27677 from rallytime/bp-27675 
Back-port #27675 to 2015.8
 2015-10-05 09:47:34 -06:00
avinassh
bfa0acfbfe Fix a typo 2015-10-05 08:58:51 -06:00
Nicole Thomas
6bc5ddc561 Merge pull request #27637 from rallytime/bp-27604 
Back-port #27604 to 2015.8
 2015-10-05 08:54:59 -06:00
Nicole Thomas
905acc6229 Merge pull request #27657 from garethgreenaway/19291_pkg_state_latest_fix 
Fix to pkg state module
 2015-10-03 17:56:02 -06:00
Gareth J. Greenaway
c950527b24 When latest is passed in the state as the version to install, once the package is installed the state runs will fail. pkg.latest_version returned an empty string once the package is installed so we need to grab the installed version in that case to avoid passing an empty string to the pkg module in question. 2015-10-03 10:07:54 -07:00
Elias Probst
f21a763809
Check for existence of 'subnetId' key in subnet dict 2015-10-03 14:01:42 +02:00
rallytime
6de99bd5b7 Docement version added for new artifactory options 
Fixes #23370
 2015-10-02 14:15:28 -06:00
Nicolas Delaby
7293ded2f6 fixup! Expose container_id in mine.get_docker 2015-10-02 21:34:51 +02:00
Thayne Harbaugh
3d2ee4297d Fix module path to SaltCacheError 
* salt.exception.SaltCacheError => salt.exceptions.SaltCacheError
                                                    ^
 2015-10-02 13:31:20 -06:00
Nicolas Delaby
9e56a7e9db Expose container_id in mine.get_docker 
Because sometimes we should be able to perform additional introspection.
 2015-10-02 21:30:33 +02:00
Mike Place
83ae6a1432 Merge pull request #27632 from rallytime/bp-27539 
Back-port #27539 to 2015.8
 2015-10-02 13:28:39 -06:00
Mike Place
888e9bdf5d Merge pull request #27633 from rallytime/bp-27559 
Back-port #27559 to 2015.8
 2015-10-02 13:22:07 -06:00