Frode Gundersen
619bd2be1e
fix lint error
2017-11-22 21:41:59 +00:00
Ch3LL
04b5a3dd4e
Add state.sls_id to ssh wrapper and tests
2017-11-22 16:01:37 -05:00
Ch3LL
69134e83ca
Change order of local kwarg in run_call method
2017-11-22 15:50:29 -05:00
Ch3LL
b3b5ecc6ff
Add pillar.items test for masterless
2017-11-22 15:40:57 -05:00
Frode Gundersen
d406cb07a3
add status.pid test
2017-11-22 18:11:39 +00:00
Nicole Thomas
1b64f15692
Merge branch '2016.11' into add_grain_tests
2017-11-22 11:22:44 -05:00
Nicole Thomas
df669b551d
Merge branch '2017.7' into ssh_jinja
2017-11-22 11:20:01 -05:00
Nicole Thomas
d6ccf4bb30
Merge pull request #44616 from Ch3LL/nonbase_test
...
Add Non Base Environement salt:// source integration test
2017-11-22 11:13:53 -05:00
Nicole Thomas
3ace504c8c
Merge pull request #44617 from Ch3LL/thindir_ssh
...
Add ssh thin_dir integration test
2017-11-22 11:12:51 -05:00
Nicole Thomas
0a54584ddb
Merge branch '2017.7' into watchin_test
2017-11-22 11:10:55 -05:00
Nicole Thomas
cd0bac87e6
Merge branch '2017.7' into improve-net-load
2017-11-22 10:36:40 -05:00
Nicole Thomas
6d861f9a74
Disable pylint warning
2017-11-22 10:36:21 -05:00
Mircea Ulinic
3a0945ce3d
Merge pull request #11 from tonybaloney/gh_44332_clone
...
Thanks @tonybaloney
2017-11-22 10:41:01 +00:00
Anthony Shaw
88ef9f18fc
ignore lint error on import
2017-11-22 08:11:07 +00:00
Anthony Shaw
25427d845e
convert key iterator to list as python 3 wont index an iterator
2017-11-22 08:10:36 +00:00
Nicole Thomas
071a1bd65b
Merge branch '2017.7' into thindir_ssh
2017-11-21 22:23:09 -05:00
Nicole Thomas
80b71652e3
Merge branch '2017.7' into nonbase_test
2017-11-21 22:23:00 -05:00
Nicole Thomas
2cd618f99b
Merge pull request #44625 from Ch3LL/delete_key_test
...
Add salt-key -d integration test
2017-11-21 22:15:22 -05:00
Nicole Thomas
443dc1e16b
Merge branch '2017.7' into delete_key_test
2017-11-21 17:10:16 -05:00
Nicole Thomas
4f30e845ee
Merge pull request #44614 from rallytime/44602-2017.7
...
[2017.7] Move PR #44602 forward to 2017.7
2017-11-21 16:21:05 -05:00
rallytime
628f015c1b
Move TimoutError check lower down in exception list
...
When called as a one-liner, the "else None" causes the following error:
TypeError: catching classes that do not inherit from BaseException is not allowed
2017-11-21 13:16:42 -05:00
C. R. Oldham
dc6de050a9
Merge pull request #44563 from creideiki/pgjsonb-timestamps-44544
...
Send Unix timestamps to database in pgjsonb returner
2017-11-21 10:44:31 -07:00
C. R. Oldham
231e412ca4
Merge branch '2016.11' into pgjsonb-timestamps-44544
2017-11-21 10:44:01 -07:00
Ch3LL
359a59dd64
Add salt-key -d integration test
2017-11-21 10:40:25 -05:00
Ch3LL
74ededafa7
Add ssh thin_dir integration test
2017-11-20 17:37:38 -05:00
Ch3LL
c9ba33432e
Add Non Base Environement salt:// source integration test
2017-11-20 16:53:56 -05:00
rallytime
d26d9ff5e4
Handle timeout_monitor/TimeoutError issues for new versions of CherryPy
...
Fixes #44601
2017-11-20 16:45:34 -05:00
Nicole Thomas
4369df020b
Merge pull request #44602 from rallytime/fix-44601
...
Handle timeout_monitor attribute error for new versions of CherryPy
2017-11-20 16:38:39 -05:00
Mike Place
136b9e3bc4
Merge pull request #44571 from rallytime/bp-43822
...
Back-port #43822 to 2017.7
2017-11-20 19:01:25 +00:00
Mike Place
898c28e6d9
Merge branch '2017.7' into watchin_test
2017-11-20 19:00:45 +00:00
Mike Place
bea7f65291
Merge pull request #44588 from rallytime/logging-in-virtual-funcs
...
Add documentation about logging before modules are loaded
2017-11-20 18:43:18 +00:00
Mike Place
4a4756fc37
Merge pull request #44604 from lorengordon/doc-exclude
...
Documents the exclude argument in state execution module
2017-11-20 18:19:18 +00:00
rallytime
ff303fd060
Handle timeout_monitor/TimeoutError issues for new versions of CherryPy
...
Fixes #44601
2017-11-20 13:12:40 -05:00
Ch3LL
ca97517795
Add jinja to ssh sls test file
2017-11-20 12:26:09 -05:00
Ch3LL
3df70f3fed
remove iter for watch_in failure test
2017-11-20 11:32:26 -05:00
Ch3LL
ac437ddf90
add order check and remove iter
2017-11-20 11:19:25 -05:00
Nicole Thomas
095f1b7d7a
Merge branch '2016.11' into add_grain_tests
2017-11-20 11:14:34 -05:00
Nicole Thomas
a8044b73c3
Merge pull request #44513 from rallytime/bp-44472
...
Back-port #44472 to 2017.7
2017-11-20 11:09:01 -05:00
Loren Gordon
c4a6c40eb3
Documents the exclude argument in state execution module
2017-11-20 11:08:37 -05:00
Nicole Thomas
bce50154e5
Merge branch '2017.7' into improve-net-load
2017-11-20 10:59:54 -05:00
rallytime
90d1cb221d
Add documentation about logging before modules are loaded
2017-11-20 09:05:49 -05:00
Mike Place
f55b9daa63
Merge pull request #44596 from roaldnefs/fix-mattermost-doc
...
Fixed Mattermost module documentation
2017-11-19 23:30:52 +00:00
Roald Nefs
549f4806ce
Fixed documentation in Mattermost module
...
- Updated the code examples.
- Added extra whitspace where needed.
2017-11-19 19:45:21 +01:00
Nicole Thomas
f84a2b5ab1
Merge pull request #44528 from bodhi-space/infra5978
...
INFRA-5978 - fix for https://github.com/saltstack/salt/issues/44290
2017-11-17 12:35:44 -05:00
Nicole Thomas
7f2dd0382c
Merge pull request #44537 from Ch3LL/ssh_highlow
...
Add multiple salt-ssh state integration tests
2017-11-17 12:17:47 -05:00
Nicole Thomas
1975fb41bc
Merge pull request #44576 from rallytime/remove-napalm-logging
...
Remove logging from top of napalm util file
2017-11-17 09:55:12 -05:00
Nicole Thomas
c2c3048f46
Merge pull request #44575 from Ch3LL/ser_run_test
...
Add service.running integration state test
2017-11-16 17:27:56 -05:00
Nicole Thomas
24b1d7af31
Merge pull request #44518 from twangboy/win_fix_verify_env
...
Pass root_dir to the win_verify_env function
2017-11-16 15:57:48 -05:00
rallytime
eb91af999e
Remove logging from top of napalm util file
...
Logging should not be done anywhere in a file before a module is
loaded. This includes the `__virtual__()` function as well. This
is because these messages will be logged on every call to the loader,
which muddies the logs when the function(s) being called do not
need to use that particular module.
2017-11-16 15:36:53 -05:00
Ch3LL
7536150567
Add service.running integration state test
2017-11-16 14:12:59 -05:00
