Pedro Algarvio
fc0bec50d4
Merge pull request #51295 from Ch3LL/bp-51279
...
Backport #51279 into 2018.3.4
2019-01-24 11:10:18 +00:00
Pedro Algarvio
5c4a7a42f2
Merge branch '2018.3.4' into bp-51279
2019-01-24 11:10:00 +00:00
Pedro Algarvio
dacd1ea5f2
Merge pull request #51293 from Ch3LL/bp-51233-2
...
Backport #51233 into 2018.3.4
2019-01-24 09:17:49 +00:00
Pedro Algarvio
253f5e4608
Merge pull request #51264 from gtmanfred/2018.3
...
an argument is not always needed to be passed to open a file
2019-01-24 07:55:25 +00:00
Pedro Algarvio
f3ebd32246
Merge branch '2018.3' into 2018.3
2019-01-24 07:55:12 +00:00
twangboy
d2eba77bf7
Remove network.py patch
...
This is fixed via another PR (#51274 )
2019-01-23 14:11:40 -05:00
twangboy
d431c713c7
Add __context__ support
...
Fix issue with case sensitivity
2019-01-23 14:11:39 -05:00
Gareth J. Greenaway
a155fd7650
Accounting for when permissions are not returned from file.check_perms, eg. windows systems.
2019-01-23 14:06:37 -05:00
Gareth J. Greenaway
53ba0689a8
When test=True and there are permissions changes, report it.
2019-01-23 14:06:31 -05:00
Gareth J. Greenaway
de6c13d5a4
Handle spaces in fstab opts, similar fix to #39593
2019-01-23 14:03:39 -05:00
Pedro Algarvio
04f16b8c91
Fix tests. We no longer get ipaddress instances back.
2019-01-23 18:07:25 +00:00
twangboy
c3fa82a927
Fix minion start issue
2019-01-23 18:07:22 +00:00
Pedro Algarvio
aacc047686
Merge pull request #51274 from twangboy/fix_network
...
Fix minion start issue
2019-01-23 18:03:02 +00:00
Daniel Wallace
f553be764e
tuples don't have pop
2019-01-23 11:10:04 -06:00
Daniel Wallace
55ea80ee6c
don't shadow builtin
2019-01-23 09:53:50 -06:00
Daniel Wallace
6148c50781
an argument is not always needed to be passed to open a file
2019-01-23 09:53:50 -06:00
Daniel Wozniak
8a89cb2c4b
Merge pull request #51279 from twangboy/backport_lgpo
...
Backport __context__ support from develop
2019-01-23 08:28:46 -07:00
Daniel A. Wozniak
a5255f0eb2
Merge remote-tracking branch 'saltstack/2018.3' into issue-50221
2019-01-23 08:26:20 -07:00
Pedro Algarvio
344bf6567a
Fix tests. We no longer get ipaddress instances back.
2019-01-23 14:47:11 +00:00
Pedro Algarvio
6796e656ec
Merge pull request #51276 from garethgreenaway/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2019-01-23 07:04:20 +00:00
Gareth J. Greenaway
44ddc43ce9
Merge branch '2018.3' into merge-2018.3
2019-01-22 18:22:11 -08:00
Thomas S Hatch
0adde9b74d
Merge pull request #51220 from sathieu/artifactory-classifier-2018.3
...
Backport fixes #31179 by appling the same logic as used in the nexus module
2019-01-22 15:27:54 -07:00
Thomas S Hatch
f6a7cad822
Merge pull request #51225 from astronouth7303/loader-docs-2018.3
...
Loader docs 2018.3
2019-01-22 15:18:47 -07:00
Thomas S Hatch
1a2f680e1d
Merge pull request #51239 from garethgreenaway/51208_file_manage_escaped_double_quotes
...
[2018.3] Fixes to __build_parts in stringutils
2019-01-22 15:17:48 -07:00
Thomas S Hatch
d614127005
Merge pull request #51261 from OrangeDog/patch-2
...
Fix Zabbix returner
2019-01-22 15:15:39 -07:00
Thomas S Hatch
4fa2a0277a
Merge pull request #51267 from ethframe/fix-file-directory
...
Fix 'Path not found' error in file.directory
2019-01-22 15:14:51 -07:00
Thomas S Hatch
1abffb20b9
Merge pull request #51278 from dwoz/issue51248
...
Warn about proper validation option
2019-01-22 15:13:12 -07:00
Gareth J. Greenaway
464d813b77
Merge branch '2018.3' into fix_test_pkg
2019-01-22 13:42:03 -08:00
Gareth J. Greenaway
097103553b
Merge branch '2018.3' into merge-2018.3
2019-01-22 13:26:23 -08:00
Daniel A. Wozniak
c614198477
Use pillar roots validation method
2019-01-22 12:19:06 -07:00
Megan Wilhite
276d621799
Merge pull request #51197 from Ch3LL/tag_manager
...
Add Google Tag Manager to Docs
2019-01-22 14:08:47 -05:00
Daniel A. Wozniak
c1ea10f090
Fix py3 managed.file test failure
2019-01-22 10:46:32 -07:00
Daniel A. Wozniak
0d2b0c635f
Fix linter warnings
2019-01-22 10:40:57 -07:00
Erik Johnson
c8e70a90a6
Merge pull request #51206 from terminalmage/fix-reload
...
Fix usage of reload for PY3 compatibility
2019-01-22 11:34:45 -06:00
Erik Johnson
41ae39067e
Merge pull request #51231 from terminalmage/issue51056
...
Clarify documentation for the the gitfs "all_saltenvs" config param
2019-01-22 11:33:19 -06:00
twangboy
06b1545ce6
Remove network.py patch
...
This is fixed via another PR (#51274 )
2019-01-22 10:31:31 -07:00
twangboy
2356f2574a
Add __context__ support
...
Fix issue with case sensitivity
2019-01-22 10:26:12 -07:00
Daniel A. Wozniak
5b98895588
Fix wart in pillar_roots validation
...
Adds tests for pillar and file roots validation
2019-01-22 10:23:08 -07:00
Gareth J. Greenaway
243dc06e23
Merge branch '2017.7' into merge-2018.3
...
Conflicts:
requirements/dev.txt
tests/unit/states/test_mount.py
2019-01-22 09:08:24 -08:00
twangboy
345aa5bd4a
Fix minion start issue
2019-01-22 09:43:17 -07:00
Gareth J. Greenaway
0574476321
Merge branch '2018.3' into fix_test_pkg
2019-01-22 08:42:33 -08:00
Erik Johnson
a6a9040e50
Merge pull request #51179 from terminalmage/fix-regex-chars
...
Fix possible oversight in nodegroup modifications
2019-01-22 06:50:48 -06:00
ethframe
c10882579f
Fix missing file error in file.directory.
...
file.check_perms raises CommandExecutionError with message that starts with
'Path not found' when file or directory was deleted between _depth_limited_walk
and actual permissions check. This error was correctly ignored for directories,
but not for files. This commit fixes error message check for files.
2019-01-21 22:23:28 +03:00
James Howe
d809b9bd9c
Avoid double-counting errors and ignore test runs
2019-01-21 15:35:59 +00:00
James Howe
6ca7deb268
Remove unused host parameter and average/disaster keys
2019-01-21 15:35:59 +00:00
James Howe
2d445273f6
Just let zabbix_sender use the config file
...
There doesn't appear to be any reason to parse or override it here.
Also allows allows TLS connections to work.
2019-01-21 15:35:59 +00:00
James Howe
6404e2ca93
Fix fallback command so it's actually run
2019-01-21 15:35:59 +00:00
James Howe
b79a55afd3
Fix KeyError in Zabbix returner
2019-01-21 13:44:55 +00:00
Daniel A. Wozniak
537114cbc9
Remoe un-needed log statement
2019-01-20 17:52:45 -07:00
Lee Webb
e586370c67
Merge branch '2018.3' into 51069-ri-and-rdoc-removed
2019-01-21 10:01:46 +11:00
