valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,570 Commits 24 Branches 182 Tags 341 MiB
14cf6ce322
Commit Graph

77570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
14cf6ce322 is_windows is a function, not a propery/attribute 
While not fatal, this could potentially cause problems running this
test on Windows.
 2017-07-17 23:36:21 -05:00
Nicole Thomas
a91a3f81b1 Merge pull request #42123 from vutny/fix-master-utils-import 
DOCS: describe importing custom util classes
 2017-07-12 09:53:23 -06:00
Denys Havrysh
6bb8b8f98c Add missing doc for `utils_dirs` Minion config option 2017-07-12 11:08:34 +03:00
Denys Havrysh
f1bc58f6d5 Utils: add example of module import 2017-07-12 11:08:34 +03:00
Nicole Thomas
e2aa5114e4 Merge pull request #42261 from rallytime/minor-doc-fix 
Some minor doc fixes for dnsutil module so they'll render correctly
 2017-07-11 17:14:53 -06:00
Nicole Thomas
3e9dfbc9cc Merge pull request #42262 from rallytime/bp-42224 
Back-port #42224 to 2016.11
 2017-07-11 17:14:24 -06:00
Thomas Dutrion
c31ded341c Remove duplicate instruction in Openstack Rackspace config example 2017-07-11 16:01:15 -06:00
rallytime
8c76bbb53d Some minor doc fixes for dnsutil module so they'll render correctly 2017-07-11 15:57:32 -06:00
Nicole Thomas
7780579c36 Merge pull request #42181 from garethgreenaway/42137_backport_fix_from_2017_7 
fixes to state.py for names parameter
 2017-07-11 15:21:31 -06:00
Nicole Thomas
72537868a6 Merge pull request #42253 from gtmanfred/2016.11 
Only use unassociated ips when unable to allocate
 2017-07-11 14:53:50 -06:00
Nicole Thomas
b2a4698b5d Merge pull request #42252 from UtahDave/2016.11local 
simple docstring updates
 2017-07-11 14:48:32 -06:00
Daniel Wallace
53e25760be Only use unassociated ips when unable to allocate 
When checking the unassociated ips first, in Parallel mode, each server will
use the same one unallocated ip.
 2017-07-11 10:47:16 -06:00
David Boucha
e6a9563d47 simple doc updates 2017-07-11 10:19:22 -06:00
Nicole Thomas
781fe13be7 Merge pull request #42235 from astronouth7303/patch-1-2016.3 
Abolish references to `dig` in examples.
 2017-07-10 14:06:11 -06:00
Jamie Bliss
4cb51bd03a Make note of dig partial requirement. 2017-07-10 13:55:06 -04:00
Jamie Bliss
08e7d8351a Abolish references to dig in examples. 2017-07-10 13:53:12 -04:00
Nicole Thomas
83cbd76f16 Merge pull request #42215 from twangboy/win_iis_docs 
Add missing config to example
 2017-07-07 14:18:43 -06:00
Nicole Thomas
274946ab00 Merge pull request #42211 from terminalmage/issue40928 
Only pass a saltenv in orchestration if one was explicitly passed (2016.11)
 2017-07-07 14:16:34 -06:00
Erik Johnson
22a18fa2ed Only pass a saltenv in orchestration if one was explicitly passed (2016.11) 
Also, only pass pillarenv if explicitly passed. _get_opts() in the state
module will apply the correct saltenv (if applicable) when no explicit
saltenv/pillarenv is passed.
 2017-07-07 13:44:40 -05:00
twangboy
c07e22041a Add missing config to example 2017-07-07 12:37:22 -06:00
Nicole Thomas
89261cf06c Merge pull request #42173 from rallytime/bp-37424 
Back-port #37424 to 2016.11
 2017-07-07 10:39:59 -06:00
Mike Place
3b17fb7f83 Merge pull request #42175 from rallytime/bp-39366 
Back-port #39366 to 2016.11
 2017-07-06 14:51:47 -05:00
Gareth J. Greenaway
a34970b45b Back porting the fix for 2017.7 that ensures the order of the names parameter. 2017-07-06 12:12:50 -07:00
Nicole Thomas
ea16f47f0a Merge pull request #42172 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-07-06 12:16:28 -06:00
Nicole Thomas
6307b9873f Merge pull request #42176 from rallytime/bp-42109 
Back-port #42109 to 2016.11
 2017-07-06 12:15:34 -06:00
Mike Place
28c4e4c3b7 Merge pull request #42095 from terminalmage/docker-login-debugging 
Add debug logging to dockerng.login
 2017-07-06 12:13:04 -05:00
Arthur Lutz
686926daf7 Update aws.rst - add Debian default username 2017-07-06 11:08:06 -06:00
Dan Lloyd
53f7b987e8 Pass sig to service.status in after_toggle 
As on line 350, pass `sig` to `service.status` to ensure that the correct behavior is used. If we don't pass `sig`, upstart/sysv jobs that do not implement `service <name> status` will fail.
 2017-07-06 11:07:01 -06:00
Michael A. Smith
01addb6053 Avoid Early Convert ret['comment'] to String 
Fixes this exception:
An exception occurred in this state: Traceback (most recent call last):
  File "/var/tmp/.syops_b1274f_salt/py2/salt/state.py", line 1733, in call
    **cdata['kwargs'])
  File "/var/tmp/.syops_b1274f_salt/py2/salt/loader.py", line 1652, in wrapper
    return f(*args, **kwargs)
  File "/var/tmp/.syops_b1274f_salt/py2/salt/states/gpg.py", line 119, in present
    ret['comment'].append('Adding {0} to GPG keychain'.format(name))
AttributeError: 'str' object has no attribute 'append'
 2017-07-06 11:05:50 -06:00
rallytime
b1fa332a11 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-07-06 11:03:50 -06:00
Mike Place
2b754bc5af Merge pull request #42119 from terminalmage/issue42116 
Fix regression in CLI pillar override for salt-call
 2017-07-06 12:02:51 -05:00
Mike Place
8c0a83cbb5 Merge pull request #42121 from terminalmage/issue42114 
Fix pillar.get when saltenv is passed
 2017-07-06 11:52:33 -05:00
Nicole Thomas
687992c240 Merge pull request #42094 from terminalmage/quiet-exception 
Prevent command from showing in exception when output_loglevel=quiet
 2017-07-06 10:18:08 -06:00
Nicole Thomas
dad255160c Merge pull request #42163 from vutny/fix-42115 
Fix #42115: parse libcloud "rc" version correctly
 2017-07-06 10:15:07 -06:00
Nicole Thomas
2a8ae2b3b6 Merge pull request #42164 from Ch3LL/fix_kerb_doc 
Fix kerberos create_keytab doc
 2017-07-06 09:55:32 -06:00
Nicole Thomas
678d4d4098 Merge pull request #42141 from rallytime/bp-42098 
Back-port #42098 to 2016.11
 2017-07-06 09:11:49 -06:00
Nicole Thomas
c8afd7a3c9 Merge pull request #42140 from rallytime/bp-42097 
Back-port #42097 to 2016.11
 2017-07-06 09:11:29 -06:00
Ch3LL
7c0fb248ec Fix kerberos create_keytab doc 2017-07-06 09:46:04 -04:00
Denys Havrysh
b27b1e340a Fix #42115: parse libcloud "rc" version correctly 2017-07-06 16:43:07 +03:00
Nicole Thomas
8fa1fa5bb1 Merge pull request #42155 from phsteve/doc-fix-puppet 
Fix docs for puppet.plugin_sync
 2017-07-05 19:58:02 -06:00
Steve Katz
fb2cb78a31 Fix docs for puppet.plugin_sync so code-block renders properly and sync is spelled consistently 2017-07-05 19:56:11 -04:00
Mike Place
c239664c8b Merge pull request #42142 from Ch3LL/change_builds 
Update builds available for rc1
 2017-07-05 16:11:55 -05:00
Ch3LL
e1694af39c Update builds available for rc1 2017-07-05 17:06:06 -04:00
twangboy
bd80243233 Change repo_ng to repo-ng 2017-07-05 13:56:11 -06:00
Mike Place
9c4e132540 Import datetime 2017-07-05 13:54:02 -06:00
Daniel Wallace
1435bf177e require large timediff for ipv6 warning 2017-07-05 13:51:08 -06:00
Erik Johnson
d14291267f Fix pillar.get when saltenv is passed 2017-07-05 02:00:54 -05:00
Erik Johnson
4780d7830a Merge pull request #42078 from damon-atkins/fix_convert_flt_str_version_on_cmd_line 
pkg.install and pkg.remove fix version number input.
 2017-07-05 01:04:56 -05:00
Erik Johnson
9a268949e3 Add integration test for 42116 2017-07-05 00:48:50 -05:00
Erik Johnson
1bb42bb609 Fix regression when CLI pillar override is used with salt-call 2017-07-05 00:19:24 -05:00