Commit Graph

87279 Commits

Author SHA1 Message Date
Daniel Wozniak
8b8d41aa19
Merge branch '2017.7' into cloud_config_2017 2019-01-29 19:45:05 -07:00
Daniel Wozniak
b80320db44
Merge pull request #51402 from dwoz/win_test_fix
Add testing path to run_script commands
2019-01-29 19:44:16 -07:00
Daniel Wozniak
21359e69e8
Merge branch '2017.7' into win_test_fix 2019-01-29 19:37:50 -07:00
Daniel Wozniak
1199530a85
Merge pull request #51397 from dwoz/gemstest
Use gems.github.com no longer exists, use gemcutter.org
2019-01-29 19:37:25 -07:00
Daniel A. Wozniak
bac652f439
Add testing path to run_script commands 2019-01-29 17:52:42 -07:00
Daniel A. Wozniak
43ac36e5ff
Use gems.github.com no longer exists, use gemcutter.org 2019-01-29 14:24:27 -07:00
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
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
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
Pedro Algarvio
3840af86df
"Tell" coverage to track subprocesses. 2019-01-25 12:58:52 +00:00
Pedro Algarvio
f67a529b7a
Remove unused imports 2019-01-24 20:33:08 +00:00
Pedro Algarvio
15ab061b8c
Show objects on assertion failure 2019-01-24 16:58:42 +00:00
Pedro Algarvio
0281fc5b50
Don't fail the test because of order 2019-01-24 16:58:42 +00:00
Pedro Algarvio
9a31be7271
Don't call .keys() on dictionaries 2019-01-24 16:58:42 +00:00
Pedro Algarvio
97ced3a5ba
Add pytest-salt-from-filenames to pytest requirements 2019-01-24 16:58:41 +00:00
Pedro Algarvio
8d2c4d25df
Remove duplicate dependency 2019-01-24 16:58:41 +00:00
Pedro Algarvio
5eec144873
Add .coveragerc 2019-01-24 16:58:41 +00:00
Pedro Algarvio
aa108d5dd1
Run tests from tox, wether runtests or pytest 2019-01-24 16:58:41 +00:00
Pedro Algarvio
93096392ff
Merge pull request #51305 from s0undt3ch/2017.7
Add 2017.7 codecov config
2019-01-24 13:34:02 +00:00
Pedro Algarvio
09b20dfadc
Add 2017.7 codecov config 2019-01-24 13:26:16 +00: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
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
Pedro Algarvio
acfb7d89b4 Update pytest requirements 2019-01-19 18:37:41 +00:00
Pedro Algarvio
c19479bf4e Move all of PyTest requirements to its own requiremnts file 2019-01-19 18:37:41 +00:00
Pedro Algarvio
39e633f23c
Merge pull request #51246 from garethgreenaway/bp-50358
[2017.7] Backport #50358 to 2017.7
2019-01-19 18:36:18 +00:00
Gareth J. Greenaway
c33c5589ca
Backport #50358 to 2017.7 2019-01-18 12:16:03 -08:00
Jamie Bliss
80a38262c4
Update TODO 2019-01-17 15:30:37 -05:00
Jamie Bliss
1945c30feb
Document the client-defined dunders 2019-01-17 15:28:59 -05:00
Daniel Wozniak
4a12c5fa91
Merge pull request #50852 from mirceaulinic/fix-capirca
Improve the Capirca and related modules for ACL config generation
2019-01-15 09:41:00 -07:00
Daniel Wozniak
3f4759b8bf
Merge pull request #50923 from astronouth7303/patch-2
Document {% include %}
2019-01-15 09:39:11 -07:00
Daniel Wozniak
210e817a79
Merge pull request #51111 from s0undt3ch/2017.7
[2017.7] Update to salt-bootstrap v2019.01.08
2019-01-11 20:20:47 -07:00
Mircea Ulinic
fa9126791c
Merge branch '2017.7' into fix-capirca 2019-01-11 09:34:11 +00:00
Pedro Algarvio
08e0ae76f7
Update to salt-bootstrap v2019.01.08 2019-01-09 14:22:29 +00:00
Gareth J. Greenaway
8a76a19c17
Merge pull request #50858 from jasonarewhy/bugfix-2017.7/ubuntu-networking-searchdomain
get searchdomain in Ubuntu 12+ (2017.7)
2019-01-07 16:22:48 -08:00
Gareth J. Greenaway
3395a3d185
Merge branch '2017.7' into bugfix-2017.7/ubuntu-networking-searchdomain 2019-01-07 11:52:27 -08:00
Mircea Ulinic
71913ffb12
Merge branch '2017.7' into fix-capirca 2019-01-04 21:02:20 +00:00
Mircea Ulinic
6fc3484cb8 Lint? 2019-01-04 20:46:02 +00:00
Gareth J. Greenaway
998fecaee8
Merge pull request #51030 from terminalmage/issue38502
Add unit test to ensure we don't diff bare repos
2019-01-02 17:50:26 -08:00
Erik Johnson
6dbd81fb4b
Add unit test to ensure we don't diff bare repos
Resolves #38502.
2019-01-02 15:43:16 -06:00
Thomas S Hatch
45291506e8
Merge pull request #50977 from rallytime/config-docs
Add documentation for a few config values
2018-12-28 13:57:57 -07:00
Daniel Wozniak
409594bcb8
Merge pull request #50991 from twangboy/requests_2017.7
Requests 2017.7
2018-12-28 12:28:03 -07:00
twangboy
32b9d2ad25
Update requests for osx 2018-12-27 12:03:00 -07:00
twangboy
413dc72600
Merge branch '2017.7' of https://github.com/saltstack/salt into requests_2017.7 2018-12-27 11:59:28 -07:00
twangboy
4196690bbf
Update requests to 2.21.0 2018-12-27 11:58:46 -07:00
Thomas S Hatch
e05307420d
Merge pull request #50983 from garethgreenaway/bp-50885
Back-port PR #50885 to 2017.7
2018-12-26 12:29:30 -07:00
Rémi Jouannet
09a8e6e7f7
fix a del in cloud vmware that crash when the key isn't there 2018-12-26 11:15:51 -08:00
rallytime
43c39e7408
Add documentation to master config docs for job_cache_store_endtime 2018-12-24 14:22:25 -05:00
rallytime
887cd070ca
Add some salt-api options to the master config docs 2018-12-24 14:22:25 -05:00