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
45,057 Commits 24 Branches 182 Tags 341 MiB
8a1ef674ab
Commit Graph

45057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
1e4c10b1d8 Change default for decode in http.query() 2015-01-31 12:03:05 -07:00
Thomas S Hatch
b58fe7aaf4 Merge pull request #20273 from techhat/httpclientcert 
Add handling for client-side certs to http.query()
 2015-01-31 11:14:40 -07:00
Ahmed Kamal
179153d201 Implement freebsd status.netdev 2015-01-31 18:35:55 +02:00
Joseph Hall
bf84d7206b Context is valid in Python 2.7.9 2015-01-31 08:52:29 -07:00
Joseph Hall
04e2b819bd Forgot missing import 2015-01-31 04:50:03 -07:00
Thomas S Hatch
f84249e9e5 Merge pull request #20271 from s0undt3ch/2014.7 
Don't try to import non configurable syspath variables
 2015-01-31 03:20:55 -07:00
Joseph Hall
394c8a601a Add handling for client-side certs to http.query() 2015-01-30 18:59:10 -07:00
Pedro Algarvio
f1dd99c26f Don't try to import non configurable syspath variables 2015-01-31 00:35:54 +00:00
Mike Place
0e22364a83 Merge pull request #20268 from whiteinge/django-auth-traceback 
Prevent Django auth traceback
 2015-01-30 16:43:57 -07:00
Mike Place
67ac39ae50 Merge pull request #20226 from thatch45/sudo_call 
Allow sudo priv escalation
 2015-01-30 16:43:21 -07:00
Seth House
0370bd7bd3 Added a __virtual__ function to the Django auth module 2015-01-30 16:41:50 -07:00
Seth House
8ca6fdaba4 Moved django.contrib.auth import out of module into function 
If Django is installed but DJANGO_SETTINGS_MODULE not set the loader
throws a traceback:

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/loader.py", line 925, in load_modules
    ), fn_, path, desc
  File "/usr/lib/python2.7/dist-packages/salt/auth/django.py", line 54, in <module>
    import django.contrib.auth
  File "/usr/lib/python2.7/dist-packages/django/contrib/auth/__init__.py", line 6, in <module>
    from django.middleware.csrf import rotate_token
  File "/usr/lib/python2.7/dist-packages/django/middleware/csrf.py", line 14, in <module>
    from django.utils.cache import patch_vary_headers
  File "/usr/lib/python2.7/dist-packages/django/utils/cache.py", line 26, in <module>
    from django.core.cache import get_cache
  File "/usr/lib/python2.7/dist-packages/django/core/cache/__init__.py", line 69, in <module>
    if DEFAULT_CACHE_ALIAS not in settings.CACHES:
  File "/usr/lib/python2.7/dist-packages/django/conf/__init__.py", line 54, in __getattr__
    self._setup(name)
  File "/usr/lib/python2.7/dist-packages/django/conf/__init__.py", line 47, in _setup
    % (desc, ENVIRONMENT_VARIABLE))
ImproperlyConfigured: Requested setting CACHES, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings.
 2015-01-30 16:41:33 -07:00
Seth House
68b5f5cd71 Removed unused import 2015-01-30 16:39:29 -07:00
Colton Myers
4318085f7a Merge pull request #20267 from basepi/2015.2releasenotesonly_upgrade 
Add only_upgrade to 2015.2 release notes
 2015-01-30 16:08:50 -07:00
Colton Myers
ca6ecc0f0f Add only_upgrade to 2015.2 release notes 2015-01-30 16:07:39 -07:00
Mike Place
3dfa6155a9 Merge pull request #20233 from jacksontj/2015.2 
Fix scheduler on 2015.2
 2015-01-30 14:55:01 -07:00
Thomas Jackson
82a9000617 Fix get() to use correctly named jid 2015-01-30 12:09:05 -08:00
Thomas Jackson
ed804480f9 Remove unused scheduler daemon process 2015-01-30 10:37:44 -08:00
Thomas Jackson
b6741d89b8 Change Master scheduler to use new ClientFuncsDict instaed of runner funcs directly 
With the change to forcing all runner calls through low() we forgot about the scheduler which calls functions directly. This adds an API to get that same interface.

Also means we are missing test coverage on the scheduler, since it was non-stop backtracing on the master.
 2015-01-30 10:36:09 -08:00
Thomas Jackson
a4b95be0b0 Add option to silence printing 2015-01-30 10:06:21 -08:00
Thomas Jackson
e46281900d Cleanup function calls, if you defualt to the right types, no need for the switch statement 2015-01-30 10:01:57 -08:00
Thomas S Hatch
b37eda267f Merge pull request #20250 from Azidburn/2014.7 
Fix for feature request #10258
 2015-01-30 10:58:45 -07:00
Thomas S Hatch
bfa6e864f7 lint 2015-01-30 10:49:34 -07:00
Thomas S Hatch
d0a629e721 Merge pull request #20261 from thatch45/basepi-saltssh.errors.20223 
Merge #20229 with fixes
 2015-01-30 10:36:51 -07:00
Thomas S Hatch
a2a4722906 lint fixes 2015-01-30 10:35:50 -07:00
Thomas S Hatch
68b2773628 Merge branch 'saltssh.errors.20223' of https://github.com/basepi/salt into basepi-saltssh.errors.20223 2015-01-30 10:35:05 -07:00
Thomas S Hatch
9fafe41be0 Merge pull request #20218 from felskrone/fqdn_master_status_2014.7 
improved status.master to work with fqdns
 2015-01-30 10:31:08 -07:00
Thomas S Hatch
ad6cb8c976 Merge pull request #20260 from thatch45/Jiaion-2014.7 
Merge #20241 with fixes
 2015-01-30 10:29:12 -07:00
Thomas S Hatch
17829583de lint fixes 2015-01-30 10:27:04 -07:00
Thomas S Hatch
36283d2d65 Merge branch '2014.7' of https://github.com/Jiaion/salt into Jiaion-2014.7 2015-01-30 10:26:42 -07:00
Thomas S Hatch
575edd60d6 Add changes into the minion floscript 2015-01-30 10:25:20 -07:00
Thomas S Hatch
5c94ea377f Merge pull request #20237 from joejulian/2014.7 
Issue #20235: blockdev.format fails when succeeding
 2015-01-30 10:18:06 -07:00
Thomas S Hatch
8d01b6ae9d Merge pull request #20238 from joejulian/2015.2 
Issue #20235: blockdev.format fails when succeeding
 2015-01-30 10:17:52 -07:00
Thomas S Hatch
f9b01bf08e Merge pull request #20231 from whiteinge/rest_cherrypy-docs-examples 
Added several examples and clarifications to the rest_cherrypy docs
 2015-01-30 10:15:23 -07:00
Thomas S Hatch
bf80cf49bc Merge pull request #20225 from jfindlay/fix_svn_mod 
extend a list not a tuple
 2015-01-30 10:11:30 -07:00
Thomas S Hatch
13a318b1ce Merge pull request #20204 from rallytime/fix_20196 
Fix #20196
 2015-01-30 10:04:58 -07:00
Thomas S Hatch
ab5cf4b92c Merge pull request #20203 from basepi/archiveextract20195 
[2014.7] Iterate over the shortopts if there are more than one for archive.extracted
 2015-01-30 10:04:27 -07:00
Pedro Algarvio
b247b7d7be Merge pull request #20217 from techhat/fileclienthttp 
Switch fileclient to salt.utils.http.query()
 2015-01-30 14:21:27 +00:00
Azidburn
6c9fd6d026 corrections from jenkins build 2015-01-30 14:34:15 +01:00
Joseph Hall
56ff04f574 Change stream/handle to return a dict, for consistency 2015-01-30 06:01:00 -07:00
Marc Thomas
441e460a20 Fix for feature request #10258 2015-01-30 13:46:54 +01:00
linxiao.jz
97f863177e fix salt libs .systemd import error 2015-01-30 17:36:39 +08:00
Joe Julian
9ea76ed9c1 Issue #20235: blockdev.format fails when succeeding 
After a mkfs is issued, an immediate lsblk will show the device as
unformatted. Issuing a sync before lsblk will allow the check to
succeed.
 2015-01-29 23:42:52 -08:00
Joe Julian
762c6228a2 Issue #20235: blockdev.format fails when succeeding 
After a mkfs is issued, an immediate lsblk will show the device as
unformatted. Issuing a sync before lsblk will allow the check to
succeed.
 2015-01-29 22:26:55 -08:00
Thomas S Hatch
45f5e95e0e WE NEED TO REMOVE THIS WHEN VT RUNS ON WINDOWS 
This is to allow for a salt-call command to shell out the fun
from the main loop instead of using a multiprocess
 2015-01-29 20:44:25 -07:00
Thomas Jackson
f444fb9ed8 Pylint 2015-01-29 18:29:26 -08:00
Thomas Jackson
064b8981bc Remove various AES sanitization attempts. 2015-01-29 18:10:56 -08:00
Thomas Jackson
6439ad9db9 Move AES key out of opts. 
This way we can avoid accidently passing it all sorts of places it shouldn't be.

I'm doing something similar in my transport overhaul, so this will match more with that.
 2015-01-29 18:08:52 -08:00
Seth House
23745daa55 Replaced HTTP examples with HTTPS 
Lead by example!
 2015-01-29 18:36:01 -07:00
Seth House
538e80af04 Added a note about recommended CherryPy versions due to SSL errors 2015-01-29 18:32:01 -07:00