Thomas S Hatch
f511ad278c
Merge pull request #51227 from astronouth7303/doc-modules-additional-globals
...
Document the client-defined dunders
2019-01-29 10:27:07 -07:00
Jamie Bliss
cbe1e171d6
Merge branch '2017.7' into doc-modules-additional-globals
2019-01-29 12:09:32 -05:00
twangboy
19e518134d
Fix issue when directory doesn't exist
2019-01-28 21:25:33 -07:00
Pedro Algarvio
ab60782de4
Merge pull request #51319 from terminalmage/issue51255
...
git.latest: add auth to merge/reset calls when LFS used with SSH auth
2019-01-28 23:19:29 +00:00
Pedro Algarvio
04eb66bc8e
Merge branch '2018.3' into issue51255
2019-01-28 23:19:04 +00:00
Daniel A. Wozniak
0de189d272
Handle pipenv like version restrictions
...
We need to handle python_version filters in requirement files in order
to install cleanly using pip
2019-01-28 13:39:39 -07:00
Pedro Algarvio
f4e169255b
Fix test
2019-01-28 20:37:05 +00:00
Daniel A. Wozniak
542d85713b
Fix linter issues
2019-01-28 10:32:00 -07:00
Daniel A. Wozniak
a2bbf4dea8
Fix linter issues
2019-01-28 10:30:35 -07:00
Daniel A. Wozniak
004d9b828f
Cloud provider and profile configs are merged
2019-01-28 10:23:18 -07:00
Daniel A. Wozniak
a8af3baed2
Cloud provider and profile configs are merged
2019-01-28 10:20:54 -07:00
Erik Johnson
ad17ac591c
Fix mocks to reflect changes to git.latest state
2019-01-28 10:46:26 -06:00
Daniel Wozniak
fdf2cf4893
Merge pull request #51250 from yosnoop/fix-salt-utils-dns-lookup
...
Fix broken lookup in salt/utils/dns.py
2019-01-27 16:53:52 -07:00
Daniel Wozniak
73528a54dd
Merge pull request #51339 from dwoz/aws_role_backport
...
Backport aws role support [2018.3]
2019-01-27 16:50:16 -07:00
Daniel Wozniak
43a9d2f972
Merge pull request #51338 from Ch3LL/bp-51207
...
Backport #51207 into 2018.3.4
2019-01-27 16:44:58 -07:00
Daniel Wozniak
3dcd11d5a6
Merge pull request #51337 from Ch3LL/bp-51170
...
Backport #51170 into 2018.3.4
2019-01-27 16:44:23 -07:00
Daniel Wozniak
4e855050e8
Merge branch '2018.3.4' into bp-51170
2019-01-27 16:44:10 -07:00
Daniel Wozniak
7908875bc0
Merge pull request #51341 from Ch3LL/bp-51299
...
Backport #51299 into 2018.3
2019-01-27 16:43:35 -07:00
Daniel Wozniak
7656aa5f66
Merge pull request #51340 from Ch3LL/bp-51252
...
Backport #51252 into 2018.3.4
2019-01-27 16:42:48 -07:00
Daniel Wozniak
326425cb4e
Merge pull request #51352 from garethgreenaway/fixing_service_beacon_documentation
...
[2018.3] Fixing service beacon documentation
2019-01-27 16:41:31 -07:00
Gareth J. Greenaway
021fe85cfb
Fixing the documentation for the service beacon. If not options are provided for the service then there needs to be an empty dictionary.
2019-01-26 15:26:39 -08:00
Ty Hahn
0ddfad1270
Merge branch '2018.3' into fix-salt-utils-dns-lookup
2019-01-26 06:55:49 +09:00
Pedro Algarvio
14a84e803c
Merge pull request #51333 from Ch3LL/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2019-01-25 20:51:20 +00:00
Pedro Algarvio
27d7a89081
Merge branch '2018.3' into merge-2018.3
2019-01-25 20:51:08 +00:00
Ty Hahn
9fb4abea3f
Merge branch '2018.3' into fix-salt-utils-dns-lookup
2019-01-26 05:31:46 +09:00
Wayne Werner
e3080f10d6
Add sleep before sending stop over UDP
...
UDP packets are unordered - and apparently on Mac it's pretty easy for
the stop message to come before the last message we're trying to test
with. This has us wait a tenth of a second more before we tell the test
thing to stop.
Signed-off-by: Wayne Werner <wwerner@saltstack.com>
2019-01-25 14:48:40 -05:00
Daniel A. Wozniak
e74a6c61de
Fix py3 managed.file test failure
2019-01-25 14:42:50 -05:00
Daniel A. Wozniak
6f2c7cf9e9
Remoe un-needed log statement
2019-01-25 14:42:44 -05:00
Daniel A. Wozniak
824950c4cd
Fix 50221 regression test on Windows
2019-01-25 14:42:38 -05:00
Daniel A. Wozniak
1840af9c00
peserve newlines from pillar data for file.managed
2019-01-25 14:42:32 -05:00
Daniel A. Wozniak
156f53219a
Backport aws role support
2019-01-25 12:42:17 -07:00
twangboy
345ae676b6
Backport PR# 50771 to 2018.3 branch
2019-01-25 14:38:30 -05:00
Daniel A. Wozniak
c893dc445a
Fix saltmod roster test
2019-01-25 14:32:58 -05:00
Daniel A. Wozniak
b61854f594
Roster defines the roster system not a file
2019-01-25 14:32:52 -05:00
Daniel A. Wozniak
484bab4399
Fix linter
2019-01-25 14:32:42 -05:00
Daniel A. Wozniak
5e2db2f7af
Honor roster file for ssh orchestrations
2019-01-25 14:32:36 -05:00
Pedro Algarvio
31b921f7a5
Merge pull request #51304 from terminalmage/issue51270
...
gitfs: Fix use of deprecated pygit2 function
2019-01-25 19:01:57 +00:00
Pedro Algarvio
36673fba1d
Merge branch '2018.3' into issue51270
2019-01-25 19:01:48 +00:00
Pedro Algarvio
2c3aef7eca
Merge pull request #51313 from s0undt3ch/features/tox-runtests-2018.3
...
[2018.3] Allow running runtests.py using tox
2019-01-25 18:55:38 +00:00
Pedro Algarvio
2a9bf170da
Merge pull request #51312 from s0undt3ch/features/tox-runtests
...
[2017.7] Allow running runtests.py using tox
2019-01-25 18:54:41 +00:00
Ch3LL
ae62ebce8b
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- .codecov.yml
2019-01-25 13:06:23 -05:00
Pedro Algarvio
e90ca1d63c
Merge pull request #51290 from s0undt3ch/hotfix/fix-network
...
[2018.3.4] Fix minion start
2019-01-25 15:14:46 +00:00
Pedro Algarvio
da3aace317
Merge branch '2018.3.4' into hotfix/fix-network
2019-01-25 15:14:24 +00:00
Pedro Algarvio
2eafc5c411
"Tell" coverage to track subprocesses.
2019-01-25 13:00:03 +00:00
Pedro Algarvio
f6babeb915
Remove unused imports
2019-01-25 13:00:03 +00:00
Pedro Algarvio
ff6824c682
Don't fail the test because of order
2019-01-25 13:00:03 +00:00
Pedro Algarvio
4d12ccbb1a
Show objects on assertion failure
2019-01-25 13:00:03 +00:00
Pedro Algarvio
ee2f10a23b
Add pytest-salt-from-filenames to pytest requirements
2019-01-25 13:00:03 +00:00
Pedro Algarvio
4f4d019ef8
Remove duplicate dependency
2019-01-25 13:00:03 +00:00
Pedro Algarvio
1d4b9f5754
Add .coveragerc
2019-01-25 13:00:03 +00:00
