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,112 Commits 24 Branches 182 Tags 341 MiB
6254216462
Commit Graph

34112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
6254216462 Merge pull request #14254 from rallytime/whitespace 
Remove trailing whitespace
 2014-07-15 15:12:43 -06:00
rallytime
d761254782 Remove trailing whitespace 2014-07-15 15:12:07 -06:00
Thomas S Hatch
6abccbc0cf fix this better, don't use clean_proc from master.py. 2014-07-15 15:06:15 -06:00
Thomas S Hatch
b9421f7c8d Allow raet libs to safely import salt.master 2014-07-15 15:04:10 -06:00
Thomas S Hatch
aa9a400ff2 Merge pull request #14198 from mgwilliams/lxc-keep-http-proxy 
modules.lxc: keep http proxy for bootstrap
 2014-07-15 15:02:13 -06:00
Mike Place
6b572eaa4b Merge pull request #14253 from pass-by-value/matcher_test_raet_compat 
Matcher test raet compat
 2014-07-15 14:53:57 -06:00
Aditya Kulkarni
615e0b7550 Add timeouts to wait longer 2014-07-15 16:50:32 -04:00
Nicole Thomas
6d62f9196e Merge pull request #14251 from rallytime/remove_mixed_case 
Don't load module if zypp is not present
 2014-07-15 14:44:23 -06:00
rallytime
ef02abbdfc Don't load module if zypp is not present 2014-07-15 14:41:04 -06:00
Aditya Kulkarni
978ae5fb51 Make sure test_grain passes with raet 2014-07-15 16:27:47 -04:00
Thomas S Hatch
16bf7aabc9 Set the no refresh value in another catch point 2014-07-15 14:19:44 -06:00
Colton Myers
7a4e7204c8 Merge pull request #14248 from basepi/zypperfix14158 
Don't use dict comprehensions in Python 2.6, Refs #14158
 2014-07-15 14:03:58 -06:00
Colton Myers
a6759a33ad Don't use dict comprehensions in Python 2.6, Refs #14158 2014-07-15 14:02:44 -06:00
Colton Myers
fddf7fba07 Merge pull request #14247 from basepi/returnret14158 
Return ret, Fixes 04c685ee48, Refs #14158
 2014-07-15 13:17:22 -06:00
Colton Myers
d675d49e06 Return ret, Fixes 04c685ee48, Refs #14158 2014-07-15 13:16:51 -06:00
Thomas S Hatch
04c685ee48 Fix issue in dict comprehensition from #14158 2014-07-15 13:12:28 -06:00
Nicole Thomas
6a5f00c3ce Merge pull request #14244 from rallytime/fix_cache_tests 
Change python asserts to unittest asserts
 2014-07-15 13:10:19 -06:00
Thomas S Hatch
739ae438eb Merge pull request #14158 from rominf/module-zypper-repo 
Add repo managing functionality to the zypper module
 2014-07-15 12:25:46 -06:00
Thomas S Hatch
da8612ddcc Merge pull request #14243 from cachedout/masterswarm 
Refactor into base swarm and master/minion swarm
 2014-07-15 12:22:46 -06:00
rallytime
7bea8f5cb6 Change python asserts to unittest asserts 2014-07-15 11:56:50 -06:00
Mike Place
200ef6b642 Refactor into base swarm and master/minion swarm 2014-07-15 11:31:07 -06:00
Thomas S Hatch
25a4df3566 Merge pull request #14238 from rallytime/fix_spelling 
Fix spelling error: doctring -> docstring
 2014-07-15 10:41:16 -06:00
Thomas S Hatch
4e91eee9ca Merge pull request #14228 from terminalmage/issue13873 
Fix regression in templating local files
 2014-07-15 10:38:45 -06:00
Thomas S Hatch
fb374c784e Merge pull request #14226 from garethgreenaway/14180 
Additions to docstrings for aptpkg module and pkgrepo state.
 2014-07-15 10:37:27 -06:00
Thomas S Hatch
bb9760b1ed Merge pull request #14223 from jacksontj/develop 
Remove unecessary (hopefully) sleep from highstate run (from #12137).
 2014-07-15 10:36:14 -06:00
Matthew Williams
81aaf6715e modules.lxc: str -> basestr 2014-07-15 16:34:29 +00:00
Thomas S Hatch
b1f53043fe Merge pull request #14219 from moreda/topic/improve-varnish-module 
Added support to manage bans and params
 2014-07-15 10:34:09 -06:00
Thomas S Hatch
ecd6f3069d Merge pull request #14212 from cachedout/roles 
Add salt roles
 2014-07-15 10:32:47 -06:00
Mike Place
c5cd238555 role --> __role 2014-07-15 10:28:16 -06:00
Thomas S Hatch
ed01fdf296 I can't figure out why this creates a violation on line 502 2014-07-15 10:05:44 -06:00
Thomas S Hatch
c508be8732 Merge pull request #13919 from leonardinius/fix-13793-postgres 
Fix for 13793 postgres
 2014-07-15 09:56:16 -06:00
rallytime
486aa982ad Fix spelling error: doctring -> docstring 2014-07-15 09:26:55 -06:00
Joseph Hall
a1a7cf84aa Merge pull request #14234 from felskrone/multimaster_pki_settings 
Multimaster pki settings and Tutorial
 2014-07-15 06:01:15 -06:00
vs
b1142570bc add note that points to multimaster_pki as an alternative setup 2014-07-15 03:42:39 -07:00
vs
f1a4b30020 add note that points to mulitmaster as an alternative setup 2014-07-15 03:42:21 -07:00
vs
f440b0f111 link in the multimaster_pki_tutorial 2014-07-15 03:41:12 -07:00
Leonids Maslovs
6c3973ec05 WIP 13793 Unit tests fixed 2014-07-15 13:19:07 +03:00
Leonids Maslovs
a708201214 WIP 13793 Revert accidental whitespace changes 2014-07-15 13:19:07 +03:00
Leonids Maslovs
9619001ab3 WIP 13793 sql syntax fix 2014-07-15 13:19:06 +03:00
Leonids Maslovs
4b3150d2fb WIP 13793 Reverting accidental whitespace changes 2014-07-15 13:19:06 +03:00
Leonids Maslovs
4f38eeaac9 WIP 13793 Skips superuser on update 2014-07-15 13:19:05 +03:00
Leonids Maslovs
16e11c9fd2 WIP 13793 Initial fix 2014-07-15 13:19:04 +03:00
Volker Schwicking
3ca39de6d0 add settings for multimaster-pki 2014-07-15 12:10:18 +02:00
Volker Schwicking
f3d6c705ee add settings multimaster-pki 2014-07-15 12:09:52 +02:00
Pedro Algarvio
518cee98b8 Merge pull request #14233 from whiteinge/rest_cherrypy-cors-tool 
Improve CORS support by extracting to single CherryPy tool
 2014-07-15 10:43:04 +01:00
Seth House
cc9ff19b5e Add clarification to rest_cherrypy about using CORS with EventSource 2014-07-15 03:01:14 -06:00
Seth House
f659ee5b29 Extract rest_cherrypy CORS support into a single tool/handler duo 2014-07-15 03:00:49 -06:00
David Boucha
8bddefc53b Merge pull request #14229 from whiteinge/rest_cherrypy-run-sessions 
Add rest_cherrypy tests for the /run entrypoint; fix session reference when sessions are disabled
 2014-07-15 02:12:15 -06:00
Seth House
c5abea8ea9 Merge pull request #14232 from UtahDave/fix_ec2 
fix keyerror
 2014-07-15 01:40:12 -06:00
David Boucha
c863bfd169 fix keyerror 2014-07-15 01:38:30 -06:00