Nicole Thomas
2dc3e5c42a
Merge pull request #44613 from Ch3LL/pillar_masterless
...
Add pillar.items test for masterless
2017-11-29 09:43:10 -05:00
Nicole Thomas
cc05481026
Merge pull request #44659 from Ch3LL/ssh_sls_id
...
Add state.sls_id to ssh wrapper and tests
2017-11-29 09:41:47 -05:00
Gareth J. Greenaway
642eed11e1
Merge pull request #44698 from Ch3LL/mine_ssh
...
Add salt-ssh mine.get integration test
2017-11-28 14:15:28 -08:00
Nicole Thomas
5d82df5667
Merge pull request #44697 from Ch3LL/show_top_test
...
Sort the show_top results for test_state_show_top test
2017-11-28 15:35:40 -05:00
Nicole Thomas
2c2e1e2332
Merge branch '2017.7' into pillar_masterless
2017-11-28 13:35:12 -05:00
Ch3LL
974db59dc1
convert the assert to a union set instead
2017-11-28 10:57:55 -05:00
Ch3LL
add43c4cfe
Sort the show_top results for test_state_show_top test
2017-11-28 10:43:45 -05:00
Nicole Thomas
f6a72acfe3
Merge branch '2017.7' into mine_ssh
2017-11-27 17:01:51 -05:00
Nicole Thomas
f2f6817e86
Merge pull request #44608 from Ch3LL/ssh_jinja
...
Add jinja to ssh sls test file
2017-11-27 17:00:27 -05:00
Ch3LL
9e67babf85
Add teardown to remove ssh dir
2017-11-27 16:51:02 -05:00
Ch3LL
f90b4f7653
Add salt-ssh mine.get integration test
2017-11-27 16:38:19 -05:00
Nicole Thomas
04b97bcfad
Merge pull request #44663 from whytewolf/ZD1777_ensure_understanding_of_minion_config_over_grains_file
...
Update notes around grains topic, and salt.modules.grains and salt.state.grains
2017-11-27 16:33:37 -05:00
Nicole Thomas
364deee6ac
Merge pull request #44332 from cloudflare/improve-net-load
...
Improve the net.load_config execution function
2017-11-27 16:22:17 -05:00
Nicole Thomas
b6a1ed06b8
Merge pull request #44664 from mvivaldi/patch-1
...
Patch 1
2017-11-27 16:17:19 -05:00
Nicole Thomas
9ea4ee1479
Merge pull request #44549 from cloudflare/fix-proxy-grains
...
Allow proxy minions to load static grains
2017-11-27 15:57:08 -05:00
Nicole Thomas
5ec7ea0bb5
Merge pull request #44572 from Ch3LL/watchin_test
...
Add watch_in integration test
2017-11-27 15:52:31 -05:00
Thomas Phipps
c9122e4b85
fixed pylint error, and updated description on at the top the the module and state.
2017-11-27 11:08:12 -07:00
mvivaldi
4551999ec7
Update jinja.py
...
the name of the jinja filter is wrong in the documentation
2017-11-23 09:53:58 +01:00
mvivaldi
ae13d57307
Update file.py
...
the name of the jinja filter is wrong in the documentation
2017-11-23 09:47:24 +01:00
Thomas Phipps
7fb208b5ad
Update note in topics/grains to reflect that not all grains are ignored.
...
only those set in the minion config
also update header of salt.modules.grains to more closely match what
states says in regard to this.
and tweak the note portion to stand out a bit more.
tweaked the state note to also stand out more
2017-11-22 15:17:45 -08: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
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
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
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
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
a8044b73c3
Merge pull request #44513 from rallytime/bp-44472
...
Back-port #44472 to 2017.7
2017-11-20 11:09:01 -05:00
Nicole Thomas
bce50154e5
Merge branch '2017.7' into improve-net-load
2017-11-20 10:59:54 -05:00
