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
77,699 Commits 24 Branches 182 Tags 341 MiB
27a8a2695a
Commit Graph

77699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
27a8a2695a Merge pull request #42829 from twangboy/win_pkg_fix_install 
Fix passing version in pkgs as shown in docs
 2017-08-10 10:07:24 -04:00
Nicole Thomas
3c3ac6aeb2 Merge pull request #42838 from twangboy/win_doc_pki 
Document requirements for win_pki
 2017-08-10 09:59:45 -04:00
twangboy
f0a1d06b46 Standardize PKI Client 2017-08-09 17:53:22 -06:00
twangboy
7de687aa57 Document requirements for win_pki 2017-08-09 17:49:20 -06:00
garethgreenaway
b3e2ae3c58 Merge pull request #42805 from rallytime/bp-42552 
Back-port #42552 to 2016.11
 2017-08-09 15:37:55 -07:00
garethgreenaway
d2ee7934ed Merge pull request #42804 from rallytime/bp-42784 
Back-port #42784 to 2016.11
 2017-08-09 15:37:40 -07:00
Nicole Thomas
4cbf8057b3 Merge pull request #42826 from terminalmage/fix-spelling 
Fix misspelling of "versions"
 2017-08-09 15:39:42 -04:00
twangboy
83b9b230cd Add winrepo to docs about supporting versions in pkgs 2017-08-09 12:05:42 -06:00
twangboy
81fefa6e67 Add ability to pass version in pkgs list 2017-08-09 11:59:32 -06:00
Erik Johnson
00f93142e4 Fix misspelling of "versions" 2017-08-09 12:24:06 -05:00
remijouannet
5a91c1f2d1 update consul module following this documentation https://www.consul.io/api/acl.html 2017-08-08 14:21:49 -04:00
Daniel Wallace
dbd29e4aaa only read file if it is not a string 2017-08-08 14:19:00 -04:00
Nicole Thomas
de997edd90 Merge pull request #42786 from Ch3LL/fix_typo 
Fix typo for template_dict in http docs
 2017-08-08 14:14:50 -04:00
Nicole Thomas
bf6153ebe5 Merge pull request #42795 from lomeroe/bp-42744_201611 
backport #42744 to 2016.11
 2017-08-08 13:17:14 -04:00
lomeroe
695f8c1ae4 fix #42600 in develop 
attempt to write data to regpol file even if data_to_write is empty
(i.e. no policies configured)
 2017-08-08 09:24:51 -05:00
Mike Place
61fad97286 Merge pull request #42748 from whiteinge/save-before-output 
Workaround Orchestrate problem that highstate outputter mutates data
 2017-08-07 16:11:32 -05:00
Mike Place
a4e3e7e786 Merge pull request #42764 from amendlik/cloud-win-loop 
Fix infinite loop with salt-cloud and Windows nodes
 2017-08-07 15:47:06 -05:00
Ch3LL
90a2fb66a2 Fix typo for template_dict in http docs 2017-08-07 16:45:42 -04:00
Nicole Thomas
da85326ad4 Merge pull request #42694 from gtmanfred/2016.11 
allow adding extra remotes to a repository
 2017-08-07 14:08:10 -04:00
Mike Place
7b2119feee Merge pull request #42669 from garethgreenaway/42642_2016_11_augeas_module_fix 
[2016.11] Fixes to augeas module
 2017-08-06 12:58:02 -05:00
Seth House
de60b77c82 Workaround Orchestrate problem that highstate outputter mutates data 2017-08-04 13:01:50 -06:00
Adam Mendlik
f3dcfca4e0 Fix infinite loops on failed Windows deployments 2017-08-04 09:09:15 -06:00
Mike Place
30725769ed Merge pull request #42629 from xiaoanyunfei/tornadoapi 
tornado api
 2017-08-03 17:21:19 -05:00
Mike Place
f0f00fcee1 Merge pull request #42655 from whiteinge/rest_cherrypy-reenable-stats 
Reenable cpstats for rest_cherrypy
 2017-08-03 15:44:10 -05:00
Mike Place
21cf15f9c3 Merge pull request #42693 from gilbsgilbs/fix-rabbitmq-tags 
Fix RabbitMQ tags not properly set.
 2017-08-03 15:23:08 -05:00
Daniel Wallace
1a0457af51 allow adding extra remotes to a repository 2017-08-02 10:30:29 -06:00
NLR
78fccdc7e2 Cast to list in case tags is a tuple. 2017-08-02 17:57:41 +02:00
NLR
287b57b5c5 Fix RabbitMQ tags not properly set. 2017-08-02 17:50:02 +02:00
Seth House
deb6316d67 Fix lint errors 2017-08-01 14:17:13 -06:00
Gareth J. Greenaway
24413084e2 Updating the call to shlex_split to pass the posix=False argument so that quotes are preserved. 2017-08-01 12:40:31 -07:00
Mike Place
f2b0c9b4fa Merge pull request #42574 from sbojarski/boto-cfn-error-reporting 
Fixed error reporting in "boto_cfn.present" function.
 2017-08-01 12:55:29 -05:00
Seth House
6bd91c8b03 Reenable cpstats for rest_cherrypy 2017-07-31 15:17:36 -06:00
Mike Place
bc1effc4f2 Merge pull request #42623 from terminalmage/fix-unicode-constructor 
Fix unicode constructor in custom YAML loader
 2017-07-31 14:25:17 -05:00
xiaofei.sun
1e13383b95 tornado api 2017-07-29 11:40:02 +08:00
Erik Johnson
fcf45889dd Fix unicode constructor in custom YAML loader 
2e7f743 added this in the wrong place, it should not have been added
within the if block since we will _always_ want this constructor
available.
 2017-07-28 15:35:30 -05:00
Slawomir Bojarski
5c945f10c2 Fix debug message in "boto_cfn._validate" function. 2017-07-28 12:57:10 -04:00
Slawomir Bojarski
181a1beecc Fixed error reporting in "boto_cfn.present" function. 
Fixes #41433
 2017-07-28 12:56:49 -04:00
Nicole Thomas
cbf752cd73 Merge pull request #42515 from gtmanfred/backslash 
Allow not interpreting backslashes in the repl
 2017-07-28 10:00:08 -06:00
garethgreenaway
549495831f Merge pull request #42586 from gdubroeucq/2016.11 
[Fix] yumpkg.py: add option to the command "check-update"
 2017-07-27 16:51:59 -07:00
Nicole Thomas
6b45debf28 Merge pull request #41988 from redmatter/fix-dockerng-network-matching 
Fix dockerng.network_* name matching
 2017-07-27 15:25:06 -06:00
Daniel Wallace
cc4e45656d Allow not interpreting backslashes in the repl 
Without this, if append or prepend is used with file.replace, the backslashes
will not be interpreted when appending the file, but the next time the state is
run, the backslashes could be interpreted and removed from the line.
 2017-07-27 14:21:58 -06:00
Nicole Thomas
4b16109122 Merge pull request #42339 from isbm/isbm-jobs-scheduled-in-a-future-bsc1036125 
Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc#1036125)
 2017-07-27 13:05:50 -06:00
Nicole Thomas
6c5a7c604a Merge pull request #42077 from vutny/fix-jobs-scheduled-with-whens 
Fix scheduled job run on Master if `when` parameter is a list
 2017-07-27 13:04:22 -06:00
Mike Place
f9cb536589 Merge pull request #42414 from vutny/unify-hash-params-format 
DOCS: unify hash sum with hash type format
 2017-07-27 13:48:40 -05:00
Mike Place
535c922511 Merge pull request #42523 from rallytime/fix-42375 
Add a mention of the True/False returns with __virtual__()
 2017-07-27 13:13:06 -05:00
Mike Place
0df0e7e749 Merge pull request #42527 from twangboy/win_wua 
Document changes to Windows Update in Windows 10/Server 2016
 2017-07-27 12:45:37 -05:00
Mike Place
0373791f2a Correct capatlization 2017-07-27 11:45:29 -06:00
Mike Place
69b06586da Merge pull request #42551 from binocvlar/fix-lack-of-align-check-output 
Remove '-s' (--script) argument to parted within align_check function
 2017-07-27 12:35:31 -05:00
Mike Place
9c0b5cc1d6 Remove extra newline 2017-07-27 10:59:07 -06:00
Nicole Thomas
9e0b4e9faf Merge pull request #42573 from rallytime/bp-42433 
Back-port #42433 to 2016.11
 2017-07-27 07:51:21 -06:00