Nicole Thomas
4d02e61f97
Merge branch '2017.7' into bp-44287
2017-10-27 14:56:42 -04:00
Nicole Thomas
72d617cfbe
Merge branch '2017.7' into bp-44262
2017-10-27 14:36:40 -04:00
Nicole Thomas
dbc5e224e9
Merge pull request #44316 from rallytime/fix-lint
...
Fix lint failure on 2017.7 branch
2017-10-27 14:36:08 -04:00
Morgan Willcock
facc2cd16e
Merge branch '2017.7' into badsid
2017-10-27 18:26:41 +01:00
rallytime
6d2490f6a0
Fix lint failure on 2017.7 branch
2017-10-27 13:03:01 -04:00
Daniel Wallace
39262b625e
update .kitchen.yml to run py3 tests too
2017-10-27 10:31:45 -06:00
Nicole Thomas
b2b0c770a4
Merge pull request #44279 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-10-27 12:17:18 -04:00
Jeffrey 'jf' Lim
ba0eaae95e
Fix utils.files.guess_archive_type to recognize the "tbz" extension as well
...
(also tidy up list of extensions)
2017-10-27 12:15:41 -04:00
Ollie Armstrong
ae34a15503
docker_container.running sort list of links
...
When the docker_container.running module is comparing the defined state
and the current state of a container, the list of linked containers in
the current state is is a non-deterministic order. This results in a
container recreation even though the links are the same (just in a
different order).
This patches the comparison function to lexically sort both the existing
and desired list of links, making the comparison deterministic and not
recreating a container when the links have not changed.
Fixes #44258 .
2017-10-27 12:14:16 -04:00
Erik Johnson
bd5b9dd0aa
Merge pull request #44291 from Ch3LL/pillar_test
...
add saltutil.refresh_pillar test
2017-10-27 10:19:42 -05:00
Nicole Thomas
bebc33daf5
Merge pull request #44295 from HeinleinSupport/issue44272
...
fixes issue #44272
2017-10-27 10:28:57 -04:00
Nicole Thomas
ba17a1c4d0
Merge pull request #44267 from twangboy/win_fix_lgpo
...
Fix type and Py3 issues in LGPO module
2017-10-27 10:27:50 -04:00
Justin Findlay
cc038c5bec
states.cron identifier defaults to name
2017-10-26 14:24:39 -07:00
Nicole Thomas
e16707c403
Merge pull request #44285 from Ch3LL/all_spm
...
add spm integration tests for remove and build
2017-10-26 17:20:09 -04:00
Nicole Thomas
6392896a22
Merge pull request #44301 from twangboy/win_fix_test_pydsl
...
Fix test_pydsl on Windows
2017-10-26 17:14:21 -04:00
Ch3LL
ff92f31cbe
remove skipif for docker
2017-10-26 14:43:31 -04:00
Morgan Willcock
9572aabb67
Fix traceback and incorrect message when resolving an unresolvable SID
2017-10-26 19:31:56 +01:00
twangboy
6db23757bc
Fix test_pydsl on Windows
...
Fix salt.utils.fopen to handle the 't' mode correctly in Windows
Fix the test_pysl test issues with spacing and file paths
2017-10-26 10:18:07 -06:00
Ch3LL
c13f37eee4
change service name depending on os
2017-10-26 11:44:38 -04:00
Ch3LL
1f77f3e6a3
add skipif logic for fallocate cmd
2017-10-26 10:09:33 -04:00
Nicole Thomas
8787d02688
Merge pull request #44293 from UtahDave/fix_unittest_docs
...
Fix documentation grammar and spelling errors
2017-10-26 09:05:30 -04:00
Robert Sander
f972715a45
fixes issue #44272
...
The method stop() in the state module win_service fails if the service has already been stopped.
2017-10-26 10:52:19 +02:00
Nasenbaer
f5ad6aeb70
Debug log added when throttled by API
2017-10-26 10:15:00 +02:00
Nasenbaer
c05d9aeced
Encode tags as utf-8, retry policy readout
2017-10-26 10:15:00 +02:00
David Boucha
c919648ab4
Fix documentation grammar and spelling errors
2017-10-25 17:24:26 -06:00
Ch3LL
34e2955445
add saltutil.refresh_pillar test
2017-10-25 15:56:49 -04:00
Mike Place
6e33743c1a
Merge pull request #44248 from Ch3LL/spm_create_repo
...
SPM tests: use _spm_build_files method during test_build setup
2017-10-25 21:45:02 +02:00
Mike Place
e7ca9f8407
Merge pull request #44286 from gtmanfred/2016.11
...
use our git repo for kitchen-salt
2017-10-25 21:27:32 +02:00
rallytime
8237f45a46
Add print_function to __future__ import list
2017-10-25 14:54:03 -04:00
Ch3LL
980c43ebc9
change skip message check to docker
2017-10-25 13:43:13 -04:00
Ch3LL
3955537609
change skip if check to docker
2017-10-25 13:40:58 -04:00
Ch3LL
aa8875a0e2
change service name to docker
2017-10-25 13:39:46 -04:00
Sean Jenkins
613d500876
Merge branch '2016.11' into issue-39901
2017-10-25 11:17:57 -06:00
Sean Jenkins
b97e8046ca
Utilize salt.utils.validate.net.* and _raise_error_iface
2017-10-25 11:16:27 -06:00
Daniel Wallace
193e715e37
use our git repo for kitchen-salt
2017-10-25 11:15:17 -06:00
Ch3LL
03b5c4bc6d
add spm integration tests for remove and build
2017-10-25 12:09:51 -04:00
Ch3LL
0a387c2ecd
fix pylint
2017-10-25 12:08:29 -04:00
Ch3LL
f383f05a93
Add SPM create_repo integration test
2017-10-25 12:06:08 -04:00
rallytime
055b0701de
Lint fix from sloppy merge conflict resolution
2017-10-25 11:58:44 -04:00
rallytime
1c3cb5c6a4
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- .gitignore
- tests/unit/states/test_file.py
2017-10-25 10:04:08 -04:00
Mike Place
bd75be24ca
Merge pull request #44253 from Ch3LL/spm_install
...
Add multiple spm integration tests
2017-10-25 15:36:02 +02:00
Mike Place
75ee1ebc50
Merge pull request #44254 from twangboy/win_fix_test_win_groupadd
...
Fix `unit.modules.test_win_groupadd` for Windows
2017-10-25 15:33:39 +02:00
Mike Place
8a1ea165af
Merge pull request #44259 from gtmanfred/2016.11
...
begin switching in kitchen-salt for running the test suite
2017-10-25 15:30:34 +02:00
Mike Place
4c23fa63bb
Merge pull request #44266 from Ch3LL/proxy_tests
...
Add state, grains and service proxy tests
2017-10-25 15:08:49 +02:00
Mike Place
9d6bc8509b
Merge pull request #44268 from twangboy/win_fix_lgpo_typo
...
Fix typo
2017-10-25 15:01:34 +02:00
Mike Place
0beb65a283
Merge pull request #44269 from terminalmage/fix-log-message
...
Fix log message in salt.utils.gitfs
2017-10-25 15:00:57 +02:00
Dmitry Kuzmenko
e1a7605623
Workaround progressbar failure if minion is behind syndic.
2017-10-25 15:59:35 +03:00
twangboy
5d22d34cac
Use unicode_literals
2017-10-24 17:35:03 -06:00
twangboy
40636397d8
Fix set for Py3
2017-10-24 16:40:04 -06:00
Erik Johnson
bc9cd65496
Fix log message in salt.utils.gitfs
...
This needed to be using the config overlay function and not referencing
the attribute directly.
2017-10-24 17:36:29 -05:00
