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
68,733 Commits 24 Branches 182 Tags 341 MiB
2f11df98ca
Commit Graph

68733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elias Probst
2f11df98ca
Handle exceptions in _get_virtual() and in _get_virtual() consumers 2016-08-04 20:07:21 +02:00
Nicole Thomas
bd0496eef5 Merge pull request #35182 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-03 14:57:29 -06:00
rallytime
c35974f78f Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-03 13:36:00 -06:00
Nicole Thomas
67d8dd0fd0 Don't discard running beacons config when listing becaons (#35174) 
Refs #34827
 2016-08-03 13:35:14 -06:00
Nicole Thomas
3754550dd2 Add missing CLI Examples to aws_sqs module funcs (#35173) 2016-08-03 11:14:13 -06:00
Mike Place
f9f92ad326 Merge pull request #35150 from rallytime/2016.3.3-release-notes 
Start release notes for 2016.3.3
 2016-08-03 07:46:31 -06:00
Mike Place
518ecf897a Merge pull request #35157 from hu-dabao/func-return-string 
master returned from func should be a string as designed so far
 2016-08-03 07:29:16 -06:00
Hengyang Hu
a7506af4c9 master returned from func should be a string as designed so far 2016-08-02 17:27:26 -07:00
rallytime
a64026fc99 Start release notes for 2016.3.3 2016-08-02 15:47:17 -06:00
Jacob Hammons
f4d869fb0f doc version updated to 2016.3.2 (#35147) 
updated the navigation headings
 2016-08-02 14:21:52 -06:00
Jacob Hammons
4967ed275f doc version update to 2015.8.11, updates to release notes (#35145) 2016-08-02 13:55:32 -06:00
Mike Place
dc7d7db3d5 Merge pull request #35136 from s0undt3ch/2016.3 
Don't restart processes if the manager is not set to restart them
 2016-08-02 12:40:05 -06:00
Nicole Thomas
bf04bd3316 Merge pull request #35133 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-02 12:06:18 -06:00
Pedro Algarvio
7b8bf2d2b4
Don't restart processes if the manager is not set to restart them 2016-08-02 18:19:34 +01:00
rallytime
0d5f0b6016 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-02 10:40:26 -06:00
Mike Place
dd91006ed7 Merge pull request #35120 from kstreee/fix-missing-first-stream-data 
The '_handle_event_socket_recv' function in Salt Api is missing first data of stream.
 2016-08-02 10:22:50 -06:00
Nicole Thomas
7895c97e91 Fix docstring for code-block of rst (#35131) 2016-08-02 10:05:29 -06:00
Mike Place
77b1f43b0d Merge pull request #35110 from hu-dabao/master-check-lighter 
Do not return job status back to master for master_alive and master_failback schedules
 2016-08-02 01:49:46 -06:00
kstreee
28f793caac Fix missing first data in stream when subscribing stream using a function 'read_async'. 2016-08-02 07:37:25 +00:00
Mike Place
81845ee31d Merge pull request #35114 from terminalmage/git_pillar-env-remap-docs 
Add clarification docs on a common git_pillar misconfiguration
 2016-08-01 18:30:47 -06:00
Erik Johnson
5951554e9f Add clarification docs on a common git_pillar misconfiguration 2016-08-01 18:54:50 -05:00
Erik Johnson
88a9fb1b31 Merge pull request #34768 from hrumph/bad-installed-state 
Fixes #34767
 2016-08-01 16:46:16 -05:00
Hengyang Hu
3a3b66e27d dont return job status back to master for master_alive and master_failback schedules 2016-08-01 14:45:20 -07:00
Nicole Thomas
94a983f129 Merge pull request #35104 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-01 12:56:42 -06:00
Mike Place
6c056a829e Merge pull request #35105 from rallytime/update-2016.3.0-release-notes 
Update 2016.3.0 release notes with repo.saltstack.com Xenial pkg availability
 2016-08-01 11:26:54 -06:00
Mike Place
343576408f Merge pull request #35043 from rallytime/new-release-notes 
Start release notes file for 2015.8.12
 2016-08-01 11:22:04 -06:00
rallytime
fbaff3e98e Update 2016.3.0 release notes with repo.saltstack.com Xenial pkg availability 
Refs #33870
 2016-08-01 11:14:53 -06:00
rallytime
dda2c32325 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/saltutil.py
  - salt/returners/postgres_local_cache.py
 2016-08-01 11:06:43 -06:00
Mike Place
848bf0272f Merge pull request #35050 from terminalmage/fix-saltdev-arg 
[orchestration] Properly handle runner/wheel funcs which accept a 'saltdev' argument
 2016-08-01 09:48:08 -06:00
Mike Place
1f8a0fd1e7 Merge pull request #35059 from vutny/event-function-args 
Add `fun_args` field to events generated by execution of Master modules
 2016-08-01 07:01:42 -06:00
Mike Place
d137c4b986 Merge pull request #34955 from lubyou/fix-dism-on-non-english-systems 
force dism to always output english text
 2016-08-01 06:54:03 -06:00
Mike Place
ff7ddf0b68 Merge pull request #35078 from jacobweinstock/fix-missing-non-keyword-argument 
added missing non-keyword argument skip_verify to __get_artifact func…
 2016-08-01 06:22:47 -06:00
Jacob Weinstock
c40314ba80 added missing non-keyword argument skip_verify to __get_artifact function 2016-07-30 13:32:38 -06:00
Johannes Scholz
63c974a3d0 add missing comma 2016-07-30 11:01:45 +02:00
Mike Place
2144178ae0 Merge pull request #35066 from jfindlay/postgres_log 
returners.postgres_local_cache: do not log in __virtual__
 2016-07-29 19:32:17 -06:00
Justin Findlay
c2c442234f returners.postgres_local_cache: do not log in __virtual__ 2016-07-29 13:03:36 -06:00
Erik Johnson
40cfa7cf17 Avoid needlessly running 2 argspecs in salt.utils.format_call() 
Both format_call() and arg_lookup() perform an argspec, and
format_call() invokes arg_lookup(). This commit allows for an argpsec to
be passed into arg_lookup(), avoiding the need to perform the argspec a
second time.
 2016-07-29 13:08:31 -05:00
Mike Place
878e200cd9 Merge pull request #35008 from hu-dabao/fix-multimaster 
Fix multimaster failover on more than two masters and failback behaviour
 2016-07-29 10:34:36 -06:00
Mike Place
11ed147448 Merge pull request #35055 from galet/2016.3 
#33536 pkgrepo.managed does not disable a yum repo with "disabled: True"
 2016-07-29 09:40:15 -06:00
Denys Havrysh
19d080445b Add fun_args field to events generated by execution of Master modules 2016-07-29 18:03:09 +03:00
Mike Place
ebaee39b2b Merge pull request #35039 from whiteinge/module-run-saltenv 
Add saltenv support to module.run
 2016-07-29 08:01:03 -06:00
Mike Place
32ed78a399 Merge pull request #35046 from eliasp/2016.3-salt.states.network-prevent-backtrace 
Prevent backtrace in `salt.states.network`
 2016-07-29 07:59:09 -06:00
Mike Place
f34bb7a8de Merge pull request #35054 from lubyou/fix-win_dacl-disable_inheritance 
Only fail user lookup is the user parameter is required
 2016-07-29 07:58:41 -06:00
Galet, Michal
d70796bbfe
#33536 pkgrepo.managed does not disable a yum repo with "disabled: True" 
- This fixes the pkgrepo state and yumpkg module for EL systems. The state was not working with enabled neither with disabled fields.
- Fixes the situation when the "disabled" was saved into the repo file. Internally works with "disabled" but saves "enabled".
 2016-07-29 14:15:16 +02:00
Johannes Scholz
1e4e856fb2 Only fail user lookup is the user parameter is required 
get() and check_inheritance() have an optional user parameter.
While said parameter is optional, the functions in questions
do not treat it as such, which at the very least breaks
disable_inheritance() (used by win_dacl.disableinheritance) and
enable_inheritance (used by win_dacl.enableinheritance), as those
functions call check_inheritance() without the user parameter.
 2016-07-29 13:07:57 +02:00
Erik Johnson
fd186b7e4c Pass environment as 'saltdev' if runner/wheel func accepts a saltdev argument 2016-07-29 01:54:00 -05:00
Erik Johnson
951b52ab93 Pass __env__ from saltmod orch states to to saltutil.{runner,wheel} 2016-07-29 01:52:45 -05:00
Elias Probst
1542cd5124
Prevent backtrace in salt.states.network 
Prevents this backtrace:
```
  File "/usr/lib64/python2.7/site-packages/salt/state.py", line 1723, in call
    **cdata['kwargs'])
  File "/usr/lib64/python2.7/site-packages/salt/loader.py", line 1650, in wrapper
    return f(*args, **kwargs)
  File "/usr/lib64/python2.7/site-packages/salt/states/network.py", line 513, in system
    old = __salt__['ip.get_network_settings']()
  File "/usr/lib64/python2.7/site-packages/salt/loader.py", line 1053, in __getitem__
    func = super(LazyLoader, self).__getitem__(item)
  File "/usr/lib64/python2.7/site-packages/salt/utils/lazy.py", line 93, in __getitem__
    raise KeyError(key)
KeyError: 'ip.get_network_settings'
```
 2016-07-29 01:36:05 +02:00
rallytime
bdcc81a384 Start release notes file for 2015.8.12 2016-07-28 17:16:49 -06:00
Seth House
7ef287e09e Add saltenv support to module.run 
This kwarg gets stripped by the state compiler before this function is
ever invoked.
 2016-07-28 15:54:31 -06:00