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
80,215 Commits 24 Branches 182 Tags 341 MiB
f2d855bfbf
Commit Graph

80215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mircea Ulinic
ab8bc6d015 Netconfig added in Nitrogen not 2016.11.1 2017-03-24 13:09:46 +00:00
Mircea Ulinic
423dda9149 Strip include from append_minionid_config_dirs, leave only default_include 2017-03-24 12:30:12 +00:00
Pablo Suárez Hernández
b1de79abcf Adds custom 'timeout' and 'gather_job_timeout' to 'local_batch' client 
Fixes 'local_batch' client to be aware of 'timeout' and 'gather_job_timeout' parameters that are coming from kwargs.
 2017-03-24 12:23:12 +00:00
qluo1
b4ade181ef Fix issue-40243: schedule.purge only purge single job 
return result too early in the purge loop.

https://github.com/saltstack/salt/issues/40243
 2017-03-24 22:27:09 +11:00
vnitinv
146f8abc4c sync with upstream 2017-03-24 12:18:14 +05:30
Nitin Kr
507c553c0e Merge pull request #21 from rajvidhimar/salt_test 
Remove usage of nose in junos unit tests
 2017-03-24 11:43:32 +05:30
Anthony Shaw
10c84303db
fix unit tests 2017-03-24 15:13:03 +11:00
Tyler Goodlet
8bfa8e0d15 Document qcow support 2017-03-23 23:36:32 -04:00
Anthony Shaw
605a12dbc0
linting 2017-03-24 14:05:19 +11:00
Mircea Ulinic
14923b6fde Adding proxy module changes under Nitrogen release notes 2017-03-24 01:55:48 +00:00
Mircea Ulinic
a0a2f60961 Note proxy_merge_grains_in_module 2017-03-24 01:55:48 +00:00
Mircea Ulinic
5919d612b2 Adding Nitrogen notes to the proxy topic 2017-03-24 01:55:48 +00:00
Mircea Ulinic
01e9de2d04 Add proxy to index 2017-03-24 01:55:48 +00:00
Mircea Ulinic
18d84dc083 tpyo 2017-03-24 01:55:48 +00:00
Mircea Ulinic
2cfda17165 Add Nitrogen proxy opts to conf 2017-03-24 01:55:48 +00:00
Mircea Ulinic
09670fe9a0 Reference proxy options 2017-03-24 01:55:48 +00:00
Mircea Ulinic
2e42506225 Do not create separate schdule dir for proxies 2017-03-24 01:36:34 +00:00
Mircea Ulinic
247029fc38 Add default_include and include to append_minionid_config_dirs 2017-03-24 01:36:22 +00:00
Matt Phillips
4f18ba3436 typo in states/netconfig.py 2017-03-23 20:00:51 -04:00
David Murphy
031c9457ba Execution module network support for AIX 2017-03-23 17:41:23 -06:00
rallytime
77415369cc Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/states/pkg.py
 2017-03-23 16:47:52 -06:00
rallytime
dbf74330ec Merge branch '2016.11' into 'develop' 
Conflicts:
  - pkg/windows/req_base.txt
  - salt/modules/ssh.py
 2017-03-23 16:40:44 -06:00
Mike Place
75cfcf2f46 Merge pull request #40223 from arount/fix/utils/job/keyerror 
salt.utils.job: Fix bad KeyError handling
 2017-03-23 15:11:30 -06:00
Mike Place
0e2d52c3ea Merge pull request #40260 from lubyou/fix-join_domain 
Use win32api.FormatMessage to cover more system codes
 2017-03-23 15:07:26 -06:00
Mike Place
3d3a737811 Merge pull request #40229 from bewing/load_config_changes 
Refactor processing return data from network.load_config
 2017-03-23 14:40:54 -06:00
Mike Place
0c62bb37d3 Merge pull request #40275 from UtahDave/2016.3local 
remove reference to auth_minion.
 2017-03-23 14:34:43 -06:00
Brandon Ewing
f028e939f5 Clean up temporary file in net.load_template 2017-03-23 15:25:14 -05:00
Eldad Rudich
3c15a32764 Fixing boto_rds.py delete() wait_for_deletion, if statement was incorrectly checking the return value of boto_rds.py exists() method. 2017-03-23 21:51:02 +02:00
Sergey Kizunov
64d224ad02 rabbitmq: Do not use __context__ for persistent globals 
The rabbitmq module was using `__context__` to store paths of
rabbitmq executables. `__context__` may be cleared but the module
still could remain in use, in which case it would fail to work
correctly. Move the paths of the rabbitmq executables to their own
global variables so that they are not affected by the lifespan of
`__context__`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-03-23 14:46:36 -05:00
Mike Place
57ce474d73 Merge pull request #40265 from terminalmage/issue40219 
Fix two mod_aggregate bugs in pkg states
 2017-03-23 13:34:34 -06:00
Mike Place
167045fda1 Merge pull request #40273 from bewing/load_template_cleanup 
Clean up temporary file in net.load_template
 2017-03-23 13:33:32 -06:00
Mike Place
830aac8235 Merge pull request #40271 from cachedout/remove_travis 
Remove Travis config
 2017-03-23 13:32:53 -06:00
Mike Place
e462a04d70 Merge pull request #40200 from DSRCorporation/features/zh864_auth_redesign 
E-Auth refactoring
 2017-03-23 13:32:20 -06:00
Nicole Thomas
1d66961ce7 Merge pull request #40242 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-23 13:31:39 -06:00
Pedro Algarvio
e092a1a377 Merge pull request #40272 from twangboy/win_tests_decode_names 
Fix parser for windows... again...
 2017-03-23 19:29:33 +00:00
David Boucha
9f0c9802c2 remove reference to auth_minion. 
Support for this option was removed years ago and is no longer needed.
 2017-03-23 13:08:51 -06:00
rallytime
0d31d2c4d1 Add a couple more patches for docker.version information 2017-03-23 12:57:46 -06:00
rallytime
a9c5eebaf0 Clean up dockerng unit tests to avoid global variables and fixup some patching 2017-03-23 12:44:57 -06:00
twangboy
72cb96a642 Fix parser for windows... again... 2017-03-23 12:24:26 -06:00
Brandon Ewing
fb1632ac2d Clean up temporary file in net.load_template 2017-03-23 13:23:15 -05:00
Mike Place
bbf7b55a16 Remove unused import for traceback 2017-03-23 12:11:32 -06:00
Brandon Ewing
b0aebcdab6 Move debug to pchanges and copy all to comment 2017-03-23 13:00:44 -05:00
Mike Place
c6308d2257
Removed Travis config 
Hasn't been used in years.
 2017-03-23 11:50:37 -06:00
Ethan Moore
fa2842c810 re-add .keys() usage in places needed due to dict modifications during for loop 2017-03-23 17:25:44 +00:00
Erik Johnson
1a731e0216 Pop off the version when aggregating pkg states 
This squelches a spurious warning that we get due to rewriting the low
data such that the name and version are aggregated under the "pkgs" arg,
with the "version" key remaining in the low chunk.
 2017-03-23 11:56:28 -05:00
Mike Place
7cde4936d9 Merge pull request #40213 from twangboy/win_tests_decode_names 
Decode test names in names-file
 2017-03-23 10:50:40 -06:00
Mike Place
15b81f7acc Merge pull request #40228 from mguegan/update_esky_smartos 
Update esky smartos
 2017-03-23 10:47:21 -06:00
Erik Johnson
0055fda3e9 Properly aggregate version when passed with name 
This fixes an issue in which states which contained a single package
name (no "pkgs" or "sources") paired with a "version" argument, were
having the version ignored. This is because just the name was being
added to the aggregated "pkgs".

Since we're munging low data to aggregate states, this bug wouldn't even
result in the state failing if a different version were installed.
 2017-03-23 11:43:00 -05:00
Mike Place
b7f9100e6d Merge pull request #40250 from techhat/settags 
Add wait_for_fun() to set_tags()
 2017-03-23 10:42:12 -06:00
Erik Johnson
62d76f50fc Don't aggregate both name/pkgs and sources in pkg states 
Doing so will cause problems trying to install as Salt does not support
installing from both binary packages and repository packages in the same
call to pkg.install.
 2017-03-23 11:41:58 -05:00