Frode Gundersen
|
757fde70c6
|
Merge branch '2017.7' into 45014
|
2018-07-24 11:07:14 -06:00 |
|
Nicole Thomas
|
781c6a6c36
|
Merge pull request #48743 from rallytime/saltconf-ad-2017.7
Update DOCBANNER with new SaltConf18 image
|
2018-07-24 12:46:19 -04:00 |
|
rallytime
|
6df8fd8652
|
Update DOCBANNER with new SaltConf18 image
And remove enterprise ad
|
2018-07-24 12:44:19 -04:00 |
|
Frode Gundersen
|
a7a914060d
|
add windows integration tests for states.file
|
2018-07-24 16:42:07 +00:00 |
|
Nicole Thomas
|
ce4e22224e
|
Merge pull request #48720 from Ch3LL/mac_file_path
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path
|
2018-07-23 18:32:56 -04:00 |
|
Nicole Thomas
|
4b9f037d43
|
Merge pull request #48719 from Ch3LL/service_mac_state
Enable service if disabled before running state service tests
|
2018-07-23 17:01:13 -04:00 |
|
Ch3LL
|
01d25fae19
|
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path
|
2018-07-23 15:02:27 -04:00 |
|
Ch3LL
|
f44a2fc349
|
Enable service if disabled before running state service tests
|
2018-07-23 14:05:31 -04:00 |
|
Mike Place
|
b2431eab10
|
Merge pull request #48715 from rallytime/flaky-tests
[2017.7] Mark some tornado tests as flaky
|
2018-07-23 11:27:12 -06:00 |
|
rallytime
|
7332cce567
|
[2017.7] Mark some tornado tests as flaky
|
2018-07-23 12:53:26 -04:00 |
|
Nicole Thomas
|
801eae3b8d
|
Merge pull request #48672 from frogunder/45012
add service enabled test
|
2018-07-23 11:38:48 -04:00 |
|
Mike Place
|
689c231d2b
|
Merge pull request #48691 from Ch3LL/win_repo_pkg_test
Add windows pkg module integration tests
|
2018-07-22 14:01:29 -06:00 |
|
Mike Place
|
83e4bba916
|
Merge pull request #48635 from nbraud/acme
Bug fixes in the acme module & state
|
2018-07-22 13:53:48 -06:00 |
|
Ch3LL
|
4b7d6d80c5
|
Remove unnecessary jinja in curl.sls file
|
2018-07-20 14:32:14 -04:00 |
|
Nicole Thomas
|
85991680c8
|
Merge pull request #48345 from twangboy/fix_48169
Fix behavior of powercfg module and state
|
2018-07-20 13:37:12 -04:00 |
|
Ch3LL
|
2bedadfadb
|
Add windows pkg module integration tests
|
2018-07-20 12:47:37 -04:00 |
|
Nicole Thomas
|
96447ce541
|
Merge pull request #48656 from Ch3LL/windows_ip_mod
Add windows ip module integration tests
|
2018-07-20 10:57:44 -04:00 |
|
Nicole Thomas
|
0c5fff3dc8
|
Merge pull request #48638 from twangboy/fix_vcredist
Remove vcredist 2015 from Py3 installer
|
2018-07-20 10:56:39 -04:00 |
|
Nicole Thomas
|
ead19725b6
|
Merge branch '2017.7' into fix_48169
|
2018-07-20 10:45:59 -04:00 |
|
Nicole Thomas
|
1ebd96d909
|
Merge pull request #48664 from Ch3LL/srv_disable_mac
[2017.7] Fix service.disabled test for macosx
|
2018-07-20 10:32:55 -04:00 |
|
Nicole Thomas
|
3da3cf2f3f
|
Merge pull request #48625 from Ch3LL/ssh_state
Follow up to PR #48555
|
2018-07-20 10:27:55 -04:00 |
|
Nicole Thomas
|
33812f78f1
|
Merge pull request #48673 from Ch3LL/mac_port
Use different pub and ret ports for testprogram integration tests
|
2018-07-20 10:11:51 -04:00 |
|
Nicole Thomas
|
5f6a7c4d89
|
Merge pull request #48675 from Ch3LL/mac_disable
Fix mac service.disable tests
|
2018-07-20 10:09:40 -04:00 |
|
Nicole Thomas
|
93d2f51d2b
|
Merge pull request #48658 from wyardley/wyardley-npm-json-output-2017
Improve handling of json output (#43138)
|
2018-07-20 10:08:33 -04:00 |
|
Nicole Thomas
|
3e293b0513
|
Merge pull request #48678 from OrlandoArcapix/fix-npm-dryrun-test
Fix for issue #48677 - return clean npm.bootstrap on no changes
|
2018-07-20 10:07:22 -04:00 |
|
Orlando Richards
|
851a404f6b
|
Fix for issue #48677 - return True when no changes are to be made with npm.bootstrap with test=true
|
2018-07-19 22:33:39 +01:00 |
|
Nicole Thomas
|
07a1f6520f
|
Merge pull request #48580 from rallytime/fix-46884
Don't error on retcode 0 in libcrypto.OPENSSL_init_crypto call
|
2018-07-19 15:21:12 -04:00 |
|
Ch3LL
|
c78efab828
|
Fix mac service.disable tests
|
2018-07-19 14:15:58 -04:00 |
|
Ch3LL
|
87dd85a220
|
Use different pub and ret ports for testprogram integration tests
|
2018-07-19 13:07:27 -04:00 |
|
Frode Gundersen
|
0747f2e58a
|
add service enabled test
|
2018-07-19 16:47:56 +00:00 |
|
Ch3LL
|
f1fbfad387
|
move the disable call up in try block
|
2018-07-19 10:32:21 -04:00 |
|
Ch3LL
|
f60d21bda4
|
reverse assertion order for service disable test
|
2018-07-19 10:29:18 -04:00 |
|
William Yardley
|
7ff3c9c5ff
|
Improve handling of npm json output (#43138)
Rather than look for [ or { at the beginning of a line to identify the json
output, just use salt.utils(.json).findjson.
|
2018-07-18 21:42:28 -07:00 |
|
Ch3LL
|
3727d1b3b9
|
switch try/except to match 2018.3
|
2018-07-18 18:05:17 -04:00 |
|
Ch3LL
|
fb953c2369
|
[2017.7] Fix service.disabled test for macosx
|
2018-07-18 17:58:44 -04:00 |
|
Mike Place
|
f590eb2b02
|
Update state.py
|
2018-07-18 15:37:06 -06:00 |
|
Mike Place
|
9874429741
|
Merge pull request #48628 from terminalmage/testinfra
Fix NameError in testinfra module
|
2018-07-18 15:34:02 -06:00 |
|
Ch3LL
|
90c3f568b1
|
Add windows ip module integration tests
|
2018-07-18 13:58:17 -04:00 |
|
Daniel Wallace
|
0d4c80205f
|
Merge pull request #48651 from gtmanfred/pylint-2017.7
[2017.7] handle pyzmq for python3.4
|
2018-07-18 12:34:41 -05:00 |
|
Daniel Wallace
|
b6ee52f859
|
handle pyzmq for python3.4
|
2018-07-18 12:15:23 -05:00 |
|
Daniel Wallace
|
160ae29cf2
|
Merge pull request #48647 from gtmanfred/pylint-2017.7
[2017.7] disable checks on pylint
|
2018-07-18 11:21:22 -05:00 |
|
Daniel Wallace
|
ff818c4ca2
|
disable checks on pylint
|
2018-07-18 11:13:13 -05:00 |
|
Nicolas Braud-Santoni
|
3673bae9de
|
modules/acme: explicitely ignore the perms return value
|
2018-07-18 09:19:30 +02:00 |
|
twangboy
|
e30d17099d
|
Use goto instead of if statement
|
2018-07-17 18:23:34 -06:00 |
|
Jamie Bliss
|
1800a231e8
|
Fixup some schema expectations
|
2018-07-17 18:44:52 -04:00 |
|
twangboy
|
e1042fa084
|
Remove vcredist for Py3
|
2018-07-17 16:28:01 -06:00 |
|
Nicolas Braud-Santoni
|
8c718cb417
|
acme: Make the private key mode configurable
|
2018-07-17 23:51:35 +02:00 |
|
Jamie Bliss
|
917dea6761
|
modules/acme: Use file.check_perms ret-morphing powers
As a bonus, the return value now indicates whether permissions where changed.
|
2018-07-17 23:51:21 +02:00 |
|
Nicolas Braud-Santoni
|
d2241ceb2d
|
module/acme: Do not exit early when the certificate already exists
Otherwise, acme.cert might fail to cert permissions on the certificate.
Close #48626
|
2018-07-17 23:51:21 +02:00 |
|
Nicolas Braud-Santoni
|
98af0db826
|
modules/acme: Set the private key filemode to 0640
Closes #48627
|
2018-07-17 23:51:21 +02:00 |
|