valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,813 Commits 24 Branches 182 Tags 341 MiB
78d826dd14
Commit Graph

82813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
36a1bcf8c5 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_wua.py
  - salt/utils/schedule.py
  - tests/unit/modules/rabbitmq_test.py
 2017-07-27 14:00:15 -06:00
Mike Place
4c20f1cfbb Merge pull request #42251 from twangboy/unit_win_test_win_ip 
Fix `unit.modules.test_win_ip` for Windows
 2017-07-27 14:22:03 -05:00
Richard Clark
190cdb8693 Fix file.managed check_cmd file not found - Issue #42404 2017-07-27 13:13:38 -06:00
Mike Place
2985e4c0e6 Merge pull request #42255 from twangboy/win_unit_test_win_system 
Fix `unit.modules.test_win_system` for Windows
 2017-07-27 14:12:41 -05:00
Marion Duprey
8818b06f22 Fix missing tornado import 
After upgrading my master (now in 2017.7), salt-api stopped working with the following stacktrace:

```
Tornado /usr/local/lib/python2.7/dist-packages/tornado/__init__.pyc
Process salt.loaded.int.netapi.rest_tornado.start:
Traceback (most recent call last):
  File "/usr/lib/python2.7/multiprocessing/process.py", line 258, in _bootstrap
    self.run()
  File "/usr/lib/python2.7/multiprocessing/process.py", line 114, in run
    self._target(*self._args, **self._kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/netapi/rest_tornado/__init__.py", line 118, in start
    http_server = tornado.httpserver.HTTPServer(get_application(__opts__), **kwargs)
AttributeError: 'module' object has no attribute 'httpserver'
```

Reproduced with tornado 4.2 and 4.5

This PR fixes the error above.
 2017-07-27 13:10:16 -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
a573386260 Merge pull request #42528 from twangboy/win_fix_pkg_state 
Namespace `cmp_to_key` in the pkg state for Windows
 2017-07-27 13:30:22 -05:00
Daniel Wallace
8f73804b24 make sure to pass arg as well 2017-07-27 12:28:02 -06:00
Gareth J. Greenaway
928a4808dd Updating the superseded and deprecated decorators to work when specified as pillar values. 2017-07-27 11:25:23 -07: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
Daniel Wallace
559d432930 fix tests 2017-07-27 12:00:38 -06:00
Mike Place
62ae12bcd9 Merge pull request #42534 from jmarinaro/2017.7 
Fixes AttributeError thrown by chocolatey state
 2017-07-27 12:59:50 -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
52605c249d Merge pull request #42557 from justincbeard/bugfix_37312 
Fixing output so --force-color and --no-color override master and min…
 2017-07-27 12:07:32 -05:00
Mike Place
ab33517efb Merge pull request #42567 from skizunov/develop3 
Fix disable_<tag-name> config option
 2017-07-27 12:04:59 -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
Guillaume DUBROEUCQ
d2ef4483e4 yumpkg.py: clean 2017-07-27 15:07:10 +02:00
Guillaume DUBROEUCQ
a96f7c09e0 yumpkg.py: add option to the command "check-update" 2017-07-27 14:34:56 +02:00
C. R. Oldham
e931ed2517 Merge pull request #42571 from twangboy/win_add_pythonpath 
Avoid loading system PYTHON* environment vars
 2017-07-26 16:48:55 -06:00
C. R. Oldham
30bb941179 Merge pull request #42577 from twangboy/mac_scripts 
Compile scripts with -E -s params for Salt on Mac
 2017-07-26 16:44:37 -06:00
Nicole Thomas
60cd078164 Merge pull request #42524 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-26 16:41:05 -06:00
Nicole Thomas
2acde837df Merge pull request #42575 from rallytime/merge-2017.7.1-into-2017.7 
[2017.7] Merge forward from 2017.7.1 to 2017.7
 2017-07-26 16:39:09 -06:00
twangboy
69d5973651 Compile scripts with -E -s params for python 2017-07-26 16:36:25 -06:00
Daniel Wallace
63bb0fb2c4 pass in empty kwarg for reactor 2017-07-26 14:29:49 -06:00
Daniel Wallace
2868061ee4 update chunk, not kwarg in chunk 2017-07-26 14:29:42 -06:00
rallytime
46715e9d94 Merge branch '2017.7.1' into '2017.7' 
Conflicts:
  - doc/topics/releases/2017.7.1.rst
 2017-07-26 14:29:24 -06:00
twangboy
d55a44dd1a Avoid loading user site packages 2017-07-26 14:21:41 -06:00
Erik Johnson
0293429e24 Only force saltenv/pillarenv to be a string when not None 
This fixes a regression introduced to make numeric saltenv/pillarenv
work properly.
 2017-07-26 13:58:31 -06:00
twangboy
9af1eb2741 Ignore any PYTHON* environment vars already on the system 2017-07-26 13:42:12 -06:00
twangboy
4e2fb03a95 Add pythonpath to batch files and service 2017-07-26 12:21:14 -06:00
Nicole Thomas
5c7def9a43 Merge pull request #42564 from rallytime/bp-42555 
Back-port #42555 to 2017.7.1
 2017-07-26 11:32:01 -06:00
Sergey Kizunov
0f0b7e3e0a Fix disable_<tag-name> config option 
Previously, the logic always looked for `disable_<tag-name>s` in
the config options. The issue with this is that the following tag names
already end with 's': `beacons`, `engines`, `grains`, `log_handlers`,
`serializers`, `states`, and `utils`. So previously, if you wanted to
disable a beacon, the config option to set is `disable_beaconss` (with
'ss' at the end). Fix this so that we only append an 's' if the tag name
does not already end with an 's'.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-07-26 11:18:58 -05:00
rallytime
7bcaa5a4cc small markup fix for title 2017-07-26 09:00:45 -06:00
Ch3LL
d066b599ca add changelog to 2017.7.1 release notes 2017-07-26 09:00:34 -06:00
Nicole Thomas
1d93e92194 Merge pull request #42555 from Ch3LL/7.1_add_changelog 
add changelog to 2017.7.1 release notes
 2017-07-26 08:57:42 -06:00
Daniel Wallace
afa7a13ce3 use logic from file.directory for makedirs 2017-07-26 08:20:13 -06:00
J. Beard
ee3bc6eb10 Fixing output so --force-color and --no-color override master and minion config color value 2017-07-25 20:23:01 -07:00
Ch3LL
fb69e71093 add changelog to 2017.7.1 release notes 2017-07-25 21:10:58 -04:00
garethgreenaway
711b742c54 Merge pull request #42548 from gtmanfred/2017.7.1 
pass in empty kwarg for reactor
 2017-07-25 17:41:19 -07:00
Richard Phillis
c4fabaa192 Remove '-s' (--script) argument to parted within align_check function 
The -s argument results in no stdout output from parted in this context,
so the user must infer success or failure from the exit status.
 2017-07-26 09:15:59 +10:00
Daniel Wallace
0257c1dc32 pass in empty kwarg for reactor 2017-07-25 15:34:44 -06:00
Daniel Wallace
b948e980d2 update chunk, not kwarg in chunk 2017-07-25 15:24:31 -06:00
Mike Place
de2f397041 Merge pull request #42387 from DSRCorporation/bugs/42371_KeyError_WeakValueDict 
Fix race condition in usage of weakvaluedict
 2017-07-25 15:57:42 -05:00
rallytime
685c2cced6 Add information about returning a tuple with an error message 2017-07-25 14:44:18 -06:00
Mike Place
07c2793e86 Merge pull request #42266 from twangboy/win_unit_states_test_file 
Fix `unit.states.test_file` for Windows
 2017-07-25 15:26:32 -05:00