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
83,054 Commits 24 Branches 182 Tags 341 MiB
25c8190e48
Commit Graph

83054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
garethgreenaway
d2ee7934ed Merge pull request #42804 from rallytime/bp-42784 
Back-port #42784 to 2016.11
 2017-08-09 15:37:40 -07:00
garethgreenaway
135f9522d0 Merge pull request #42782 from rallytime/fix-42697 
Add a cmp compatibility function utility
 2017-08-09 15:37:29 -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
Adam Mendlik
dc20e4651b Ignore error values when listing Windows SNMP community strings 2017-08-08 14:40:16 -06:00
Erik Johnson
c69f17dd18 Add integration test for #42774 2017-08-08 14:20:42 -05:00
Erik Johnson
78d826dd14 Fix regression in yum/dnf version specification 
Resolves #42774.
 2017-08-08 13:55:35 -05:00
rallytime
152eb88d9f Update modules --> states in kubernetes doc module 
The kubernetes state docs are not rendering/building due to a typo
in the doc module.

Fixes #42639
 2017-08-08 14:42:34 -04:00
rallytime
8c8640d6b8 Update doc references in glusterfs.volume_present 
The "created" option has been deprecated in favor of volume_present
and the docs need to match.

Fixes #42683
 2017-08-08 14:35:53 -04: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
ac752223ad Merge pull request #42784 from gtmanfred/http 
only read file if ret is not a string in http.query
 2017-08-08 13:20:12 -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
Nicole Thomas
44995b1abf Merge pull request #42794 from lomeroe/bp-42744 
Backport #42744 to 2017.7
 2017-08-08 13:16:30 -04:00
Sergey Kizunov
fa5822009f Fix exception when master_type=disable 
The following exception occasionally occurs when `master_type=disable`:

```
  File "/usr/lib/python2.7/site-packages/salt/minion.py", line 1989,
  in handle_event
    self._fire_master(data['data'], data['tag'], data['events'],
    data['pretag'])
  File "/usr/lib/python2.7/site-packages/salt/minion.py", line 1261, in
  _fire_master
    'tok': self.tok}
AttributeError: 'Minion' object has no attribute 'tok'
```

This occurs because it tries to fire a master event when the minion
is not connected to the master, in this case due to an action from a
beacon.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-08-08 11:55:25 -05:00
Sebastian Sobczynski
1cc86592ed Update return data before calling returners 2017-08-08 16:19:29 +01: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
lomeroe
0acffc6df5 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:03:35 -05:00
Nicole Thomas
dcf474c47c Merge pull request #42708 from cro/dont_change_args_during_memoize 
Do not change the arguments of the function when memoizing
 2017-08-08 09:47:01 -04:00
Nicole Thomas
ddb671b8fe Merge pull request #42783 from rallytime/fix-flaky-py3-test 
Sort lists before comparing them in python 3 unit test
 2017-08-08 09:25:14 -04:00
Adam Mendlik
928b523797 Remove waits and retries from Saltify deployment 
The waits and retries are there to give a new VM a chance
to be created and booted. Saltify works against existing
VMs, so there is no need to wait for services to become
available.
 2017-08-07 16:26:42 -06:00
Mike Place
d69822fe93 Merge pull request #42721 from hibbert/allow_no_ip_sg 
Allow no ip sg
 2017-08-07 17:07:18 -05:00
Seth House
c7ea631558 Add more docs on the token_expire param 2017-08-07 15:37:59 -06: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
Mike Place
bf7938fbe0 Merge pull request #42769 from terminalmage/issue42538 
Fix domainname parameter input translation
 2017-08-07 15:46:04 -05:00
Ch3LL
90a2fb66a2 Fix typo for template_dict in http docs 2017-08-07 16:45:42 -04:00
Daniel Wallace
d397c90e92 only read file if it is not a string 2017-08-07 14:37:42 -06:00
rallytime
998834fbac Sort lists before compairing them in python 3 unit test 2017-08-07 16:09:43 -04:00
rallytime
d707f94863 Update all other calls to "cmp" function 
Some should just use the new utility function, while others can just
be compared more directly.
 2017-08-07 15:38:39 -04:00
rallytime
5605104285 Add a cmp compatibility function utility 
The ``cmp`` function has been removed in Python 3. This PR adds the
functionality as a salt utility, so the function can be used across
all Python versions.

Fixes #42697
 2017-08-07 15:05:46 -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
Nicole Thomas
7bf2cdb363 Merge pull request #42388 from The-Loeki/patch-1 
pillar.items pillar_env & pillar_override are never used
 2017-08-07 13:51:47 -04:00
Daniel Wallace
7ef691e8da make sure to use the correct out_file 
When installing more than one package, the out_file is not correct when doing
the install.
 2017-08-07 11:44:24 -06:00
Nicole Thomas
9a8c9ebffc Merge pull request #42770 from rallytime/merge-2017.7.1-into-2017.7 
[2017.7] Merge forward from 2017.7.1 to 2017.7
 2017-08-07 12:21:44 -04:00
Nicole Thomas
c765e528d0 Merge pull request #42768 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-07 12:21:16 -04:00
Erik Johnson
665de2d1f9 Fix domainname parameter input translation 
Resolves #42538
 2017-08-07 09:51:14 -05:00
rallytime
6d17c9d227 Merge branch '2017.7.1' into '2017.7' 
No conflicts.
 2017-08-07 10:39:19 -04:00
Nicole Thomas
3f5827f61e Merge pull request #42651 from gtmanfred/2017.7 
python2- prefix for fedora 26 packages
 2017-08-07 10:35:04 -04:00
rallytime
0f75482c37 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/netapi/rest_tornado/saltnado.py
 2017-08-07 09:57:03 -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
Mike Place
791248e398 Merge pull request #42689 from hibbert/boto_efs_fix_tags 
boto_efs_fix_tags: Fix #42688 invalid type for parameter tags
 2017-08-06 12:47:06 -05:00
garethgreenaway
1b3407649b Merge pull request #42745 from terminalmage/issue42705 
docker.compare_container: treat null oom_kill_disable as False
 2017-08-05 08:28:19 -07:00
Erik Johnson
710bdf6115 docker.compare_container: treat null oom_kill_disable as False 
Resolves #42705.
 2017-08-04 21:47:07 -05:00
Mike Place
5d5b22021b Merge pull request #42704 from whiteinge/expr_form-warn-scope-bug 
Add import to work around likely multiprocessing scoping bug
 2017-08-04 18:03:13 -05:00
Seth House
4a9f6ba44f Add token_expire_user_override link to auth runner docstring 2017-08-04 15:10:02 -06:00
Seth House
de60b77c82 Workaround Orchestrate problem that highstate outputter mutates data 2017-08-04 13:01:50 -06:00