valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
29,904 Commits 24 Branches 182 Tags 341 MiB
89dda35435
Commit Graph

29904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
89dda35435 Merge pull request #12424 from hulu/copyediting 
lots of copyediting
 2014-04-30 13:09:00 -06:00
Thomas S Hatch
6a9658bb98 Merge pull request #12423 from whiteinge/doc-mine-args 
Clarified Salt Mine docs on how to pass arguments
 2014-04-30 13:08:33 -06:00
Thomas S Hatch
a33d50cc22 Merge pull request #12418 from cvrebert/patch-2 
fix typo in states.dockerio.script() docstring
 2014-04-30 13:07:34 -06:00
Thomas S Hatch
4b843be50d Merge pull request #12417 from cvrebert/patch-1 
fix typo in runners.lxc.init() docstring
 2014-04-30 13:07:23 -06:00
Chris Rebert
45981a56f9 lots of copyediting 2014-04-30 12:06:27 -07:00
Thomas S Hatch
39c04fa57b Merge pull request #12411 from makinacorpus/ff2 
fix highstate output
 2014-04-30 13:06:11 -06:00
Seth House
fe3d6d4630 Clarified Salt Mine docs on how to pass arguments 2014-04-30 13:04:59 -06:00
Thomas S Hatch
606fa9db8d Merge branch 'steverweber-fix_ddns2' into develop 2014-04-30 13:00:36 -06:00
Thomas S Hatch
65b6d0e005 Merge branch 'fix_ddns2' of git://github.com/steverweber/salt into steverweber-fix_ddns2 
Conflicts:
	salt/config.py
 2014-04-30 13:00:26 -06:00
Chris Rebert
5f65491dd9 fix typo in states.dockerio.script() docstring 2014-04-30 11:34:12 -07:00
Chris Rebert
4bef711d2e fix typo in runners.lxc.init() docstring 2014-04-30 11:32:30 -07:00
Thomas S Hatch
aa8cee3ce3 Merge pull request #12413 from jacksontj/job_cache 
Make sure to pack the __pillar__ into the renderers
 2014-04-30 12:16:41 -06:00
Joseph Hall
cbd1725819 Merge pull request #12415 from pwaller/patch-1 
Fix link to AWS credential distribution blog post
 2014-04-30 11:04:59 -06:00
Peter Waller
237b79ccbc Fix link to AWS credential distribution blog post 
The existing link left me feeling confused and unfulfilled. I think that's possibly because it accidentally linked to the previous post in the series. I found the "correct" post by googling for it.
 2014-04-30 18:03:18 +01:00
Thomas Jackson
3f766a3927 Make sure to pack the __pillar__ into the renderers 2014-04-30 09:12:10 -07:00
Joseph Hall
253a44f51c Merge pull request #12414 from whiteinge/doc-salt-mine-ex 
Add example to Salt Mine docs
 2014-04-30 10:06:18 -06:00
Seth House
9dcc8a3eda Removed version added from Salt Mine docs; other clean up 2014-04-30 09:58:38 -06:00
Seth House
6ce4b953eb Added a full example to the Salt Mine docs 2014-04-30 09:58:30 -06:00
Joseph Hall
23472d7b72 Merge pull request #12409 from jslatts/s3fs_verify_ssl 
Adding verify_ssl flag to S3 filesystem
 2014-04-30 09:37:13 -06:00
Mathieu Le Marec - Pasquet
2e8fde3ee3 fix highstate output 2014-04-30 17:28:05 +02:00
Pedro Algarvio
283c459e20 Merge pull request #12410 from s0undt3ch/hotfix/jenkins 
Lint fixes
 2014-04-30 16:09:23 +01:00
Pedro Algarvio
cc4f8add2d Fix white-space issue 2014-04-30 16:08:50 +01:00
Pedro Algarvio
9a20d4f43a Fix logic 2014-04-30 16:07:23 +01:00
Justin Slattery
6e6303637a Adding verify_ssl flag to S3 filesystem 2014-04-30 10:58:58 -04:00
Joseph Hall
4f0d00fa1c Merge pull request #12405 from ranl/salt_cloud_win 
restart salt-minion after salt-cloud deployment on windows
 2014-04-30 08:32:39 -06:00
Pedro Algarvio
14738980f6 Merge pull request #12406 from arthurlogilab/patch-3 
Update deb_apache module to use __virtualname__
 2014-04-30 13:27:39 +01:00
Arthur Lutz
8369bd0c81 Update deb_apache module to use __virtualname__ 2014-04-30 14:23:05 +02:00
ranl
43c7530a15 restart salt-minion after salt-cloud deployment on windows 2014-04-30 12:14:04 +03:00
Pedro Algarvio
7278635f28 Don't pip stderr to stdout 2014-04-30 08:39:49 +01:00
Thomas S Hatch
35a263adca Merge pull request #12398 from garethgreenaway/adding_ssh_user_keys 
Missing versionadded in user_keys for ssh module
 2014-04-30 00:38:30 -06:00
Gareth J. Greenaway
ee588ae887 adding the versionadded 2014-04-30 21:41:47 -07:00
Thomas S Hatch
7b68e9fdc5 Lint 2014-04-30 00:36:55 -06:00
Thomas S Hatch
89a4c6bd24 Lint and style 2014-04-29 22:33:55 -06:00
Thomas S Hatch
8a119b4ec6 Merge pull request #12395 from whiteinge/doc-event-tags 
Added docs for some Salt events
 2014-04-29 22:29:22 -06:00
Thomas S Hatch
61bf60bf5e Merge pull request #12393 from garethgreenaway/adding_ssh_user_keys 
Additions to ssh module
 2014-04-29 22:28:40 -06:00
Gareth J. Greenaway
f52fefbc1c Adding the ability to retrieve user ssh keys from minions for all users or a particular user. 2014-04-30 18:20:08 -07:00
Thomas S Hatch
856ca93cf2 Merge pull request #12392 from whiteinge/return-event-bool 
Return a value from saltutil refresh_modules and refresh_pillar
 2014-04-29 22:23:48 -06:00
Thomas S Hatch
3681185a64 Merge pull request #12385 from makinacorpus/ff 
Ff
 2014-04-29 22:18:50 -06:00
Thomas S Hatch
9102d43ce8 Merge pull request #12380 from cachedout/pack_trim 
Pack trim
 2014-04-29 22:16:50 -06:00
Thomas S Hatch
2cf16be1c9 Merge pull request #12372 from jkur/develop 
make ssh_auth.present and ssh_auth.absent behave sanely with same key ma...
 2014-04-29 21:50:47 -06:00
Thomas S Hatch
89674ab654 Merge pull request #12368 from s0undt3ch/hotfix/lazy-load-keyring 
Late import `keyring` to avoid slow downs.
 2014-04-29 21:46:48 -06:00
Thomas S Hatch
5f91399caa Merge pull request #12366 from ticosax/move-dns-and-volumes-from 
Move dns and volumes_from from create_container() to start()
 2014-04-29 21:46:01 -06:00
Seth House
8022565be4 Added index entries for Salt Mine 2014-04-29 21:43:13 -06:00
Seth House
d1c20e4496 Added intial docs for various events 2014-04-29 21:43:13 -06:00
Seth House
3515804fe6 Added directive for Salt events 2014-04-29 21:43:12 -06:00
Thomas S Hatch
b7c1ffadc9 Merge branch 'develop' of git://github.com/garethgreenaway/salt into garethgreenaway-develop 
Conflicts:
	salt/utils/schedule.py
 2014-04-29 21:40:58 -06:00
Thomas S Hatch
c30880f28b Merge pull request #12354 from olliewalsh/fix_12340 
Fix schedule maxrunning logic
 2014-04-29 21:37:03 -06:00
Thomas S Hatch
0ce3f1dc62 Merge pull request #12327 from jacksontj/job_cache 
Add a LazyLoader class which will lazily load modules (with the given lo...
 2014-04-29 21:31:05 -06:00
Thomas S Hatch
29af8d405c Merge pull request #12315 from UtahDave/add_queue_returners 
Add a queue system to Salt
 2014-04-29 21:27:50 -06:00
Thomas S Hatch
8e51cbfb65 Merge pull request #12394 from richierichrawr/develop 
Excess code
 2014-04-29 21:25:16 -06:00