Daniel Wozniak
d50324b4b5
Merge branch '2017.7' into more_tests
2018-08-27 16:30:10 -07:00
Daniel A Wozniak
cd6706e9f0
Fix merge wart
2018-08-27 14:36:40 -07:00
Daniel Wallace
e371ad99eb
Merge pull request #49341 from terminalmage/issue48717
...
Update dynamic git_pillar docs to enclose env name in quotes
2018-08-27 10:21:37 -05:00
Erik Johnson
1971d09ad6
Update dynamic git_pillar docs to enclose env name in quotes
2018-08-27 09:42:33 -05:00
Daniel Wallace
00b58ee438
Merge pull request #49337 from dwoz/win_service_test_fix
...
Fix broken service stop test
2018-08-27 09:22:37 -05:00
Daniel A. Wozniak
b9c344b7ce
Fix module.archive tests for win py3
2018-08-27 00:44:41 -07:00
Daniel A. Wozniak
ac60fb8190
Comment strange code
2018-08-27 00:44:40 -07:00
Daniel A. Wozniak
5fefd6fe89
Simplify cli test fixes
2018-08-27 00:44:40 -07:00
Daniel A. Wozniak
1765d53367
Fix archive tests on Windows platform
2018-08-27 00:44:39 -07:00
Daniel A. Wozniak
06f271ff19
Add archive module tests to whitelist.txt
2018-08-27 00:44:39 -07:00
Daniel A. Wozniak
9cb8fe28c5
Add more tests to whitelist for windows
2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
b8af2387cd
Fix indent wart
2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
bc971e419e
add doc tests
2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
8899a5ee1a
Add more client tests to whitelist
2018-08-27 00:44:37 -07:00
Daniel A. Wozniak
14cd7b4830
Add cli tests to whitelist
2018-08-27 00:44:37 -07:00
Daniel A Wozniak
3e55d10584
Platform module doesn't exist in 2017.7
2018-08-27 00:44:36 -07:00
Daniel A. Wozniak
2733c02b0a
Use double quotes on windows commands
2018-08-27 00:44:36 -07:00
Daniel A. Wozniak
0394ece642
The set command does not work like inline env vars
...
Remove set command prefix on windows since it can not be run inline with
other commands.
2018-08-27 00:44:35 -07:00
Daniel Wozniak
81428eddcd
Merge pull request #49291 from dwoz/dedent
...
Add dedent that sets line endings
2018-08-26 23:55:58 -07:00
Daniel A. Wozniak
1c1727e8fd
Fix broken service stop test
2018-08-26 18:34:47 -07:00
Daniel A. Wozniak
19911987b7
Fix review nits
2018-08-26 17:03:16 -07:00
Daniel Wallace
1fd5cf10e4
Merge pull request #49320 from rallytime/fix-48694
...
Update documentation for #48694 and add deprecation warning
2018-08-25 14:56:18 -05:00
Daniel Wallace
c323096846
Merge pull request #49314 from rallytime/bp-49277
...
Back-port #49277 to 2017.7
2018-08-24 14:52:14 -05:00
rallytime
0964b5eba1
Update documentation for #48694 and add deprecation warning
...
There was a behavior change when using `salt-run cache.grains` beginning
with the 2017.7.5 release.
The behavior change happened in PR #45588 , which was back-ported to the
2017.7 branch in PR #45751 . This was done in order to fix the bug reported
in #45489 .
In order to be helpful to users, a deprecation warning was added. If ``tgt``
is not passed, no grains will be listed. Instead of suddenly requiring a ``tgt``
argument in a dot release, let's keep this optional arg around until Sodium.
When Salt Sodium is released, we can remove the warning and change ``tgt`` to be
a mandatory argument.
Fixes the last parts of #48694 .
2018-08-24 15:08:43 -04:00
Mihai Dinca
6d691b290b
Prepend current directory when path is just filename
2018-08-24 13:50:42 -04:00
Daniel A. Wozniak
6abc2daf56
Re-factor dedent to fix warts
...
- textwarp.dedent does not support bytes on py3
- make sure to preserve trailing newlines
2018-08-24 10:46:50 -07:00
Daniel A. Wozniak
75b2e3d990
Use salt.utils.to_* functions
2018-08-24 09:35:02 -07:00
Daniel A. Wozniak
fa78a7b2ee
Add dedent that sets line endings
2018-08-24 09:35:00 -07:00
Nicole Thomas
c7bae5e795
Merge pull request #49290 from rallytime/bp-44504
...
Back-port #44504 to 2017.7
2018-08-24 08:35:43 -04:00
Daniel Wallace
7a44e5967b
Merge pull request #49289 from rallytime/bp-49170
...
Back-port #49170 to 2017.7
2018-08-23 13:47:16 -05:00
Michael Calmer
6224f7b551
calling range is going up to the upper limit but not including it
2018-08-23 13:08:04 -04:00
Dawid Pogorzelski
4c29c17197
forcing mine update in the proxy minion as well
2018-08-23 13:03:24 -04:00
Dawid Pogorzelski
b1d581a2cf
force mine update on minion start
...
this should solve https://github.com/saltstack/salt/issues/42449
2018-08-23 13:03:17 -04:00
Nicole Thomas
221ea22dd0
Merge pull request #49278 from rallytime/bp-49253
...
Back-port #49253 to 2017.7
2018-08-23 12:28:03 -04:00
Daniel Wallace
b331b5ce0c
skip ID 7 for vmware hard drives
2018-08-23 10:44:46 -04:00
Daniel Wallace
879c3ad7b7
Merge pull request #49262 from bloomberg/short-circuit
...
extend #48588 to cover SyncAuth class
2018-08-22 14:04:08 -05:00
Daniel Wallace
1900aff4d3
Merge pull request #49144 from twangboy/fix_48163
...
Add timeout parameter to win_service functions
2018-08-22 13:58:13 -05:00
Matt Phillips
a3594db10f
extend #488588 to cover SyncAuth class
...
the original fix was only covered asyncauth, but the syncauth method overrode
the fix. This patch duplicates it so behavior should be consistent in both
codepaths.
2018-08-22 12:54:00 -04:00
Mike Place
395bae6486
Merge pull request #49259 from gtmanfred/flaky-2017.7
...
[2017.7] flaky tests
2018-08-22 10:40:53 -06:00
Daniel Wallace
93a576ef63
flaky tests are flaky yo
2018-08-22 11:38:23 -05:00
Daniel Wallace
f518bd3efc
mark orchestration state tests as flaky
2018-08-22 11:37:43 -05:00
Mike Place
62cc0dffd6
Merge pull request #49231 from minusf/mount-check-name
...
Check for mandatory parameters for `mount.mounted`
2018-08-22 09:26:03 -06:00
Mike Place
d55d484174
Merge pull request #49242 from dwoz/blockreplace_better_fix
...
Blockreplace better fix
2018-08-22 09:21:29 -06:00
Daniel Wallace
85f6d36f0e
Merge pull request #49236 from terminalmage/issue32737
...
Allow compound matching in eauth config expressions
2018-08-22 07:57:02 -05:00
Daniel A Wozniak
72c37271a5
Use six to make sure content is unicode
2018-08-22 01:05:53 -07:00
Daniel A Wozniak
1bf0b18224
Better blockfix replace
2018-08-21 16:15:11 -07:00
Daniel A Wozniak
dd4fcd3445
Revert "Multiple block replace test fixes"
...
This reverts commit 94ac2b4fc7
2018-08-21 16:15:10 -07:00
twangboy
d3358423ae
Use os.linesep.join instead of textwrap.dedent
2018-08-21 16:15:07 -07:00
Erik Johnson
233bbae62f
Allow compound matching in eauth config expressions
...
When we try to match the configured expression, we look for a match type
(e.g. `I@`, `G@`, etc.) at the beginning, and when we don't find one we
were falling back to a glob. This changes the fallback to compound so
that we can support compound matches. Note that the compound matching
engine will act just like the glob match engine when the host passed to
it is a single minion ID glob, so using compound as the fallback gets
you glob matching for free.
2018-08-21 14:54:39 -05:00
Frantisek Holop
eb5cab35ca
fix some underhanging indent while here...
2018-08-21 16:09:29 +02:00
