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
33,806 Commits 24 Branches 182 Tags 341 MiB
b5172ed0ac
Commit Graph

33806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Heuschober
7659e72b17 Removes whitespace. 2014-07-01 13:25:25 -04:00
Joseph Hall
9f3de3e062 Merge pull request #13867 from grischa/nova_fixes 
Nova openstack cloud adapter improvements
 2014-07-01 11:04:40 -06:00
Chad Heuschober
1c76874dc7 Fixes linting error. 2014-07-01 13:04:08 -04:00
Gareth J. Greenaway
6ee327f1a3 Adding the ability to schedule Salt jobs using cron like syntax for the time. Updated module and state to be able to use this new functionality. Some general cleanup in utils/schedule.py, modules/schedule.py and states/schedule.py 2014-07-01 10:01:08 -07:00
Craig Sebenik
2c4dd25c26 add finger_master to key module 
This would help us because we need to validate the master key is up to
date.

The plan is to expose the finger prints on the master (via salt-api).
The minion will periodically check. If it's master finger print is
wrong, then the minion will delete and start the auth process again.
 2014-07-01 09:49:35 -07:00
Mike Place
66d8d42d4e Fix missing queue args 2014-07-01 10:28:08 -06:00
Mike Place
6844e5a119 Fix failing tests 2014-07-01 10:23:30 -06:00
Chad Heuschober
592b94880b Fixes some documentation. 2014-07-01 12:00:49 -04:00
Chad Heuschober
1285cd8bdf Change mod_random to use pycrypto backend. 2014-07-01 11:55:29 -04:00
Colton Myers
afc8a3d964 Merge pull request #13865 from whiteinge/webhook-raw-http-body 
Send the raw HTTP body in the webhook event data
 2014-07-01 09:45:21 -06:00
Mathieu Le Marec - Pasquet
d9e404e4a0 Check and fix wrong x509 version field. 
This fixes #11653.
 2014-07-01 15:49:19 +02:00
Joseph Hall
07d51ade1c Merge pull request #13871 from Lothiraldan/patch-7 
Fix possible typo in pkgrepo states
 2014-07-01 03:48:54 -06:00
Boris Feld
b4fe6fd79a Fix possible typo in pkgrepo states 
Debain -> Debian
 2014-07-01 11:32:32 +02:00
Grischa Meyer
3457aad4f4 removed some debugging code accidentally commited earlier 2014-07-01 07:12:49 +00:00
Grischa Meyer
a164de623b added availability_zones to nova cloud 2014-07-01 07:12:49 +00:00
Grischa Meyer
a40944bba3 fixes for nova, porting fixes from the openstack driver 2014-07-01 07:12:49 +00:00
Seth House
8d2ccb97ed Send the raw HTTP body in the webhook event data 
This is useful for unsupported content-types or for calculating the hmac
digest of the request body in order to validate a request.
 2014-07-01 00:40:19 -06:00
Seth House
df307d0a80 We must be able to count on __salt__ being a dictionary-like object 
This fix is far from complete. FunctionWrapper in it's current form is
missing ``in`` support, ``.keys()`` support, ``.update()`` support,
maybe more.
 2014-06-30 22:51:38 -06:00
Seth House
474860701d Add try..except check for JSON errors to sls shim 
This is the same fix as in #13557 for highstate.
 2014-06-30 22:50:42 -06:00
Joseph Hall
ad558cb283 Merge pull request #13860 from nmadhok/update-dockerio-state-docs 
Updating documentation
 2014-06-30 19:43:24 -06:00
Nitin Madhok
9c4e5a3174 Updating documentation 2014-06-30 21:40:16 -04:00
Thomas S Hatch
0d7e0b7f29 Merge pull request #13858 from whiteinge/raet-auth-mktoken 
Raet auth mktoken
 2014-06-30 19:02:49 -06:00
Seth House
d51c12376f Add safe id lookup 2014-06-30 19:01:43 -06:00
Seth House
2304fef40e Add src for local route 2014-06-30 19:01:24 -06:00
Seth House
d4cf6c48bc Call factory method on Channel object 2014-06-30 19:00:43 -06:00
Thomas S Hatch
1b4736d5df lint 2014-06-30 18:01:38 -06:00
Thomas S Hatch
38dbbe5d23 A load of lint! 2014-06-30 17:51:43 -06:00
Thomas S Hatch
336a84d557 Merge pull request #13663 from cowyn/develop-yum-branch-plugin 
Refined support for yum branch plugin
 2014-06-30 17:46:06 -06:00
Thomas S Hatch
50ee9dd5af Merge pull request #13680 from pass-by-value/file_perms_no_exit 
File perms no exit
 2014-06-30 17:43:54 -06:00
Thomas S Hatch
b3b6ed53b7 Lint fixes per #13667 2014-06-30 17:43:11 -06:00
Thomas S Hatch
e426134335 Merge pull request #13667 from nlm/develop 
git_pillar: removed unnecessary loops, moved configuration check responsibility to runner
 2014-06-30 17:41:29 -06:00
Thomas S Hatch
a1c08ea97e Merge pull request #13853 from terminalmage/issue13721 
Avoid IOError tracebacks for broken pipes
 2014-06-30 17:35:30 -06:00
Thomas S Hatch
a5344ac1ae Merge pull request #13840 from felskrone/fix_empty_event_dict 
Fix empty event dict
 2014-06-30 17:29:00 -06:00
Thomas S Hatch
4811e261bc Merge pull request #13834 from s0undt3ch/hotfix/bootstrap-script 
Update to latest bootstrap-script.sh, v2014.06.30
 2014-06-30 17:27:21 -06:00
Thomas S Hatch
d7e1fd5013 support old and new config options for rbenv 2014-06-30 17:25:14 -06:00
Thomas S Hatch
aa75a5caf1 Merge pull request #13829 from Lothiraldan/modules.rbenv.install_ruby_docstring 
Improve modules.rbenv.install_ruby docstring.
 2014-06-30 17:23:17 -06:00
Thomas S Hatch
f9e6058b67 Merge pull request #13826 from nmadhok/fix-docker-pulled-image-tag 
Passing tag correctly from state to module function
 2014-06-30 17:21:30 -06:00
Thomas S Hatch
9c05a31c8a Merge branch 'nmadhok-create-docker-push-state' into develop 2014-06-30 17:20:04 -06:00
Thomas S Hatch
7de2b517ee Merge branch 'create-docker-push-state' of https://github.com/nmadhok/salt into nmadhok-create-docker-push-state 
Conflicts:
	salt/daemons/flo/core.py
	tests/integration/netapi/rest_cherrypy/test_app.py
 2014-06-30 17:19:54 -06:00
Thomas S Hatch
b7b939a623 Merge pull request #13782 from makinacorpus/salt 
Support for user in VT (and per se cmdmod)
 2014-06-30 17:12:01 -06:00
Pedro Algarvio
8437fe3988 Merge pull request #13841 from terminalmage/docs 
Add examples of how to find the package version
 2014-07-01 00:05:16 +01:00
Thomas S Hatch
91b49c59b0 Fix api resolver for getting api auth tokens on raet 2014-06-30 17:02:40 -06:00
Samuel Smith
f129e87372 Merge pull request #13856 from SmithSamuelM/sam_raet_48 
Added support for config option  "ioflo_console_logdir"
 2014-06-30 16:40:24 -06:00
Samuel M Smith
4e7a909048 Merge remote-tracking branch 'upstream/develop' into sam_raet_48 2014-06-30 16:32:29 -06:00
Samuel M Smith
24b6056621 Added support for salt config option 
ioflo_console_logdir

That dumps ioflo console logs to files in the directory specified above

these are

master.log
minion.log
maintenance.log
worker_1.log
worker_2.log etc

requires ioflo v0.9.37 or later
 2014-06-30 16:29:53 -06:00
Thomas S Hatch
c0ca50d1a8 Merge pull request #13617 from cachedout/masterapi 
Refactoring master
 2014-06-30 16:10:43 -06:00
Thomas S Hatch
a5c8ae09a3 Clean up mess from bad merge 2014-06-30 15:14:14 -06:00
Thomas S Hatch
55c34db99c Merge pull request #13854 from saltstack/revert-13570-sign_master_keys 
Revert "Sign the masters pub-key"
 2014-06-30 15:05:13 -06:00
Thomas S Hatch
1cd95aa0c8 Revert "Sign the masters pub-key" 2014-06-30 15:04:53 -06:00
Thomas S Hatch
eda36a01a3 Merge pull request #13570 from felskrone/sign_master_keys 
Sign the masters pub-key
 2014-06-30 15:04:23 -06:00