Mike Place
4ac4305c18
Merge pull request #49457 from rallytime/labels-docs
...
Remove references to unused milestones in docs
2018-08-31 08:46:50 -06:00
Nicole Thomas
41dcc3f408
Merge pull request #49461 from saltstack/revert-47100-ssh
...
Revert "Allow for not being prompted to supply a password to deploy keys to a…"
2018-08-31 09:55:34 -04:00
Daniel Wallace
0d7180a70e
Revert "Allow for not being prompted to supply a password to deploy keys to a…"
2018-08-30 16:22:29 -05:00
rallytime
d1e51db8d3
Remove references to unused milestones in docs
2018-08-30 15:12:34 -04:00
Nicole Thomas
7a166bc58a
Merge pull request #49376 from twangboy/fix_48608
...
Fix issue with duplicates in user.list_users on OSX
2018-08-30 08:57:54 -04:00
Nicole Thomas
03d97507f6
Merge pull request #49434 from dwoz/cleanup_exception_handling
...
Clean up exception handling on py3
2018-08-30 08:56:23 -04:00
Daniel Wallace
7099164fa8
Merge pull request #49389 from gtmanfred/2017.7
...
make file envs compatible with fileclient formats
2018-08-29 18:49:23 -05:00
twangboy
bf32e0ca1d
Merge branch 'fix_48608' of https://github.com/twangboy/salt into fix_48608
2018-08-29 16:41:58 -06:00
twangboy
fb97b00130
Fix broken path to libsodium tarball
2018-08-29 16:40:56 -06:00
twangboy
535d83e39e
Fix test for list_users
2018-08-29 16:39:10 -06:00
Daniel A. Wozniak
9daa992c6e
Fix group remove test logic
2018-08-29 15:22:41 -07:00
Daniel A. Wozniak
d74fab7703
Clean up exception handling on py3
2018-08-29 14:45:17 -07:00
Mike Place
24faa5e5ec
Merge pull request #49408 from terminalmage/issue49269
...
Allow our custom yaml dumper to NamespacedDictWrapper objects
2018-08-29 15:20:04 -06:00
Erik Johnson
d02ec34790
Allow our custom yaml dumper to NamespacedDictWrapper objects
...
This special dict class did not have a representer assigned to it, so
PyYAML would raise an exception when attempting to dump it.
This also removes the name overriding, as its implementation was
ill-conceived and will be deprecated in a later branch (it's only used
in this one place so deprecating should be of no-to-minimal impact).
2018-08-29 14:43:10 -05:00
Daniel Wallace
6c01662665
remove cmd key from load
2018-08-29 13:59:00 -05:00
Nicole Thomas
5746fc80c2
Merge pull request #49402 from rallytime/bp-49321
...
Back-port #49321 to 2017.7
2018-08-29 14:13:22 -04:00
rallytime
7dec9fca0c
Add flaky decorator to serializer test
...
Fixes https://github.com/saltstack/salt-jenkins/issues/1093
2018-08-29 11:43:11 -04:00
Daniel Wallace
9766f0df34
Merge branch '2017.7' into fix_48608
2018-08-29 09:40:54 -05:00
Nicole Thomas
5c723b06ac
Merge pull request #49375 from terminalmage/revert-49185
...
Revert PR #49185
2018-08-29 09:51:57 -04:00
Daniel Wallace
bdf3df3397
add cli example
2018-08-29 08:46:11 -05:00
Nicole Thomas
11d87e4a44
Merge pull request #49387 from twangboy/fix_win_repo
...
Fix winrepo.update_git_repos for masterless minion
2018-08-29 09:42:39 -04:00
Daniel Wallace
251f321135
pass load on
2018-08-29 08:41:36 -05:00
Nicole Thomas
651631d60a
Merge pull request #49390 from dwoz/archive_module
...
[2017.7] Fix archive tests for py3
2018-08-29 09:41:30 -04:00
Daniel A Wozniak
b332bebb20
Fix archive tests for py3
2018-08-29 00:35:17 -07:00
Daniel Wallace
be7c041d75
add test
2018-08-28 21:14:05 -05:00
Daniel Wallace
0ace5c137e
make file envs compatible with transport format
2018-08-28 21:09:10 -05:00
twangboy
2bf7edaa61
Import GLOBAL_ONLY
2018-08-28 17:30:34 -06:00
twangboy
40d3f2ed83
Use dscl to get list of users
2018-08-28 15:33:49 -06:00
Daniel Wozniak
c591d2b5f6
Merge pull request #49385 from dwoz/sonofa
...
The autoruns module has not been renamed
2018-08-28 14:31:22 -07:00
Daniel A. Wozniak
f9d7dbdb26
The autoruns module has not been renamed
2018-08-28 14:22:05 -07:00
Daniel Wallace
5d2c9b6002
Merge pull request #49371 from rallytime/bp-49064
...
Back-port #49064 to 2017.7
2018-08-28 16:10:42 -05:00
Daniel Wallace
f1c904e371
Merge pull request #49380 from twangboy/doc_48758
...
Add docs from a comment on issue 48758
2018-08-28 16:08:12 -05:00
Daniel Wallace
aaea2743dc
Merge branch '2017.7' into revert-49185
2018-08-28 16:07:39 -05:00
Daniel Wallace
b22a43d05c
Merge pull request #49324 from dwoz/windows_pr_builds
...
Add ci scripts for windows PR builds
2018-08-28 16:06:57 -05:00
Daniel Wozniak
7abd9cdc64
Merge branch '2017.7' into windows_pr_builds
2018-08-28 13:20:27 -07:00
Nicole Thomas
b2e4121215
Merge pull request #49379 from dwoz/whitelistagain
...
Account for more tests that are not in 2017.7
2018-08-28 15:27:45 -04:00
twangboy
6cefbdf7b7
Add docs from a comment on issue 48758
2018-08-28 13:22:15 -06:00
Daniel A. Wozniak
56ea4eebcd
Account for more tests that are not in 2017.7
...
I also made sure there are no other missing tests since this bit me once
already.
2018-08-28 12:13:52 -07:00
Nicole Thomas
7fa912052d
Merge pull request #49366 from rallytime/bp-49232
...
Back-port #49232 to 2017.7
2018-08-28 15:04:10 -04:00
twangboy
e426459260
Use a set to avoid duplicates
2018-08-28 12:06:16 -06:00
Erik Johnson
7372e9d6e3
Add minion documentation for enable_gpu_grains
2018-08-28 11:40:14 -05:00
Erik Johnson
ea1b53cb6f
Fix incorrect master docs for enable_gpu_grains
2018-08-28 11:39:53 -05:00
Erik Johnson
638210a6da
Add validation type and default minion value for enable_gpu_grains
2018-08-28 11:28:27 -05:00
Erik Johnson
49ed156dd5
Add enable_gpu_grains to the minion config stub
2018-08-28 11:28:03 -05:00
Erik Johnson
d1b7fb449c
Revert "Update documentation to correctly state enable_gpu_grains default"
...
This reverts commit 2fe675cfdd
2018-08-28 11:17:32 -05:00
William Giokas
bc52f7c1bf
Stop running lint on all files when no changes
...
Stops our lint from running on all of the files in `salt/` or `test/`
when no files were modified. By default, when tox is told to run with no
positional arguments, it'll run on all files we'd look at. When run with
positional arguments it'll run only on those files. This makes it so
that tox, by default, will only run lint checks on commits that actually
change the files in `salt/` or `test/`.
2018-08-28 10:57:56 -04:00
Rémi Jouannet
74b05ef530
fix HTTP method for acl_info
2018-08-28 10:01:39 -04:00
Daniel Wallace
dfa3861352
Merge pull request #49354 from dwoz/fix_whitelist
...
Fix whitelist.txt
2018-08-28 07:42:39 -05:00
Daniel A. Wozniak
aeb0fa3bfd
custom_grains tests do not exist
2018-08-27 21:30:01 -07:00
Daniel Wozniak
14b8094909
Merge pull request #49346 from Ch3LL/bp-49345
...
[2017.7] Backport #49345
2018-08-27 18:54:31 -07:00
