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
18,626 Commits 24 Branches 182 Tags 341 MiB
bd7b094156
Commit Graph

18626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mickey Malone
bd7b094156 Made function args available to returners 2013-10-08 21:12:37 -05:00
Pedro Algarvio
62ed9c32e6 Include the encoding header. 2013-10-09 00:05:12 +01:00
David Boucha
9c3be260c7 Merge pull request #7682 from terminalmage/windows-net-states 
Add NTP state for windows
 2013-10-08 14:29:07 -07:00
Erik Johnson
5a31008fd4 Update version number in docs to 0.17.0 2013-10-08 16:18:08 -05:00
Erik Johnson
af3e6efbaf Add NTP state for windows 2013-10-08 16:14:21 -05:00
David Boucha
496730dea5 Merge pull request #7677 from hulu/pylint 
rm trailing whitespace flagged by pylint
 2013-10-08 11:10:07 -07:00
Chris Rebert
167d1a8690 rm trailing whitespace flagged by pylint 2013-10-08 11:06:15 -07:00
David Boucha
a22d2cda60 Merge pull request #7676 from UtahDave/develop 
Bump windows installer version number
 2013-10-08 10:32:43 -07:00
David Boucha
45724660fb Bump windows installer version number 2013-10-08 11:31:19 -06:00
David Boucha
967e70582d remove hostname arguments. not needed 2013-10-08 10:09:04 -06:00
David Boucha
93879c901b Merge pull request #7674 from UtahDave/develop 
Add get_computer_name function
 2013-10-08 09:06:28 -07:00
David Boucha
a07e4c6e13 Add get_computer_name function 2013-10-08 10:05:34 -06:00
David Boucha
68f1d76081 Merge pull request #7673 from UtahDave/develop 
Add get_computer_desc
 2013-10-08 08:58:19 -07:00
David Boucha
f19a57d843 Add get_computer_desc 2013-10-08 09:57:32 -06:00
David Boucha
055054e6e3 Merge pull request #7670 from UtahDave/develop 
Add fileinput to list of Windows modules to freeze
 2013-10-08 07:25:30 -07:00
David Boucha
d5a7b2195c Add fileinput to list of Windows modules to freeze 2013-10-08 08:03:08 -06:00
Thomas S Hatch
fc552fccf6 Merge pull request #7667 from terminalmage/issue7304 
Fix race condition in salt-key
 2013-10-08 06:22:29 -07:00
Thomas S Hatch
d90491dcf1 Merge pull request #7665 from SmithSamuelM/sam_20131001 
Fixed tags for progress events and preload
 2013-10-08 06:16:41 -07:00
Thomas S Hatch
d9aa67a76c Merge pull request #7663 from evinrude/develop 
Function arguments for smtp returner
 2013-10-08 06:13:36 -07:00
Thomas S Hatch
6537a09604 Merge pull request #7631 from s0undt3ch/issues/7576-utf8-chars 
Jinja needs to be "fed" Unicode data. Fixes #7576
 2013-10-08 06:10:56 -07:00
Mickey Malone
06f12b0664 Merge remote-tracking branch 'upstream/develop' into develop 2013-10-08 05:54:08 -05:00
Thomas S Hatch
7f43413e96 Add the initial cloud method to the master for running 
salt-cloud routines. This is just made right now to run the
authorization routines, and is not yet hooked into the salt cloud api
this is primarily because the unified async salt-cloud apis don't exist
yet
 2013-10-07 23:25:03 -06:00
Thomas S Hatch
2867f81c44 Doh! self.spec_check 2013-10-07 23:25:03 -06:00
Thomas S Hatch
ad7dd8fe69 Add spec_check method to wrap arbitrary special perms routines 
Once this is plugged into the master deprecate the runner_check and
wheel_check methods
 2013-10-07 23:25:03 -06:00
Thomas S Hatch
f45fed72f3 plug rights into form changes for rights check 2013-10-07 23:25:03 -06:00
Thomas S Hatch
140e3759e9 change the routine to use the any_auth method 2013-10-07 23:25:03 -06:00
Thomas S Hatch
01fc24416f Add any_auth to map auth check functions correctly 2013-10-07 23:25:03 -06:00
Thomas S Hatch
53f72b129d make a ckminions object in authorize 2013-10-07 23:25:03 -06:00
Thomas S Hatch
af17a864a1 Create central auth checks for eauth and token in salt.auth 2013-10-07 23:25:03 -06:00
Thomas S Hatch
9268a344cc Add note on environment option in the minion config file 2013-10-07 23:25:03 -06:00
Erik Johnson
b1ae6e639a Changes in docs wording: 0.17 -> 0.17.0 
We have no 0.17 release, the release code is 0.17.0.
 2013-10-07 22:32:28 -05:00
Erik Johnson
68da3c62c7 Fix race condition in salt-key 
salt-key passes on the match glob to the applicable function within
salt.key.Key. However, if the glob includes a wildcard (or the argument
passed was -A/-D/-R, which executes the add/delete/reject on '*'), then
if there is any key activity between when the confirmation prompt
appears and when 'Y' is chosen, the wildcard could match one of the new
keys, resulting in unexpected actions being taken.

This commit changes the CLI usage of salt-key so that it passes a
dictionary of matching keys to the applicable function within
salt.key.Key. API backwards compatibility is preserved, because when
these pre-compiled dictionaries of keys are passed, they are passed in a
different argument name.
 2013-10-07 21:44:10 -05:00
Joseph Hall
6bb46c3d37 Merge pull request #7666 from s0undt3ch/hotfix/lint 
Some PEP8 Lint fixes
 2013-10-07 17:47:52 -07:00
Pedro Algarvio
e71e4b3d64 Fix PEP-8 W293, E302 2013-10-08 01:42:59 +01:00
Pedro Algarvio
31682a98ae Fix PEP-8 E302, E303, W291 2013-10-08 01:39:27 +01:00
Pedro Algarvio
30e747060d Jinja needs to be "fed" Unicode data. Fixes #7576. 
Additionally, what's returned from `render_jinja_tmpl` is also a Unicode string to that the `SLS_ENCODER` can properly encode them. Encoding UTF-8 data as UTF-8 data using the `SLS_ENCODER` does not, of course, work.
 2013-10-08 00:11:44 +01:00
Pedro Algarvio
a5a87ca1fc Mimic the test case shown @ http://goo.gl/UI7uS8 2013-10-08 00:11:19 +01:00
Samuel M Smith
eefbbc13ab Merge remote-tracking branch 'upstream/develop' into sam_20131001 2013-10-07 16:52:05 -06:00
Samuel M Smith
f8231158c7 Fixed tags for progress events in state runs 
Added preload parm to fire_master so can preload event meta data
such as jid.
 2013-10-07 16:48:00 -06:00
Mickey Malone
23000daf1b Added the default port 2013-10-07 16:47:26 -05:00
Mickey Malone
78026284b0 Added smtp port as optional configuration 2013-10-07 16:29:50 -05:00
Thomas S Hatch
1649695770 Fix #7594 
This looks simple, but the problem is quite deep, it has to do with the
value assigned to tag when prereq is the last thing called and the fact
that the recursion does not unravel in the prediced order wrt the tag
variable durring a prereq call.
 2013-10-07 15:28:29 -06:00
Colton Myers
6c85e01fa1 Merge pull request #7662 from basepi/hwm 
Change pub_hwm default to 100 (should be enough)
 2013-10-07 14:29:43 -07:00
Colton Myers
cb40ae4e9f Change pub_hwm default to 100 (should be enough) 2013-10-07 15:28:51 -06:00
Thomas S Hatch
a91b0b1d73 Merge pull request #7284 from basepi/hwm_7211 
Set pub_hwm to 1000 by default, Fix #7211
 2013-10-07 14:21:21 -07:00
Thomas S Hatch
ea2b088d52 Merge pull request #7630 from terminalmage/issue5716 
Possible fix for custom grain chicken-and-egg issue
 2013-10-07 14:14:25 -07:00
Thomas S Hatch
3477063504 Merge pull request #7643 from malinoff/fix-missing-usage-print 
Added missing arguments check
 2013-10-07 14:08:04 -07:00
Thomas S Hatch
2924404f0a Merge pull request #7477 from jacksontj/develop 
Initial addition of minion module memory limit
 2013-10-07 14:07:00 -07:00
Thomas S Hatch
2698b3a250 Merge pull request #7655 from flupke/fix-file-append 
Checking for newline at EOF in modules.file.append()
 2013-10-07 14:04:16 -07:00
Mickey Malone
c9feb68f3c Added function args to message body 2013-10-07 16:03:36 -05:00