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
lmf-mx
5afa0a1497
Merge branch '2017.7' into darwin-plist-update
2019-01-21 15:38:00 -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
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
Lenard Fudala
f46e8bec76
Fix service name in minion plist
2019-01-15 15:35:18 -06: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
rallytime
0d49746de8
Fix some formatting in master config docs
2018-12-24 14:22:24 -05:00
Thomas S Hatch
747dd699af
Merge pull request #50876 from terminalmage/issue50153
...
Fix compound matching in eauth
2018-12-20 08:11:31 -07:00
Pedro Algarvio
07fca64f85
Merge pull request #50909 from damon-atkins/jenkins_pylint
...
Update .ci/lint fix CHANGE_BRANCH name
2018-12-20 09:09:12 +00:00
Jamie Bliss
4f631a6f8b
Document {% include %}
...
Mention that jinja includes need to use the full path and cannot use relative paths.
2018-12-19 16:11:28 -05:00
Damon Atkins
da1fc3288f
change params.CHANGE_BRANCH to env.CHANGE_BRANCH
2018-12-19 18:31:16 +11:00
Jason Young
69d25aa696
update debian_ip test
2018-12-17 09:21:20 -08:00
Jason Young
a6b896c4e4
get searchdomain in Ubuntu 12+
...
resolves #39151
2018-12-17 09:21:20 -08:00
Gareth J. Greenaway
e7f0ab6f19
Merge pull request #50873 from Ch3LL/bp-50740
...
Backport #50740 to 2017.7
2018-12-14 15:59:47 -08:00
Gareth J. Greenaway
5fd9ed9aa9
Merge branch '2017.7' into bp-50740
2018-12-14 15:55:07 -08:00
Gareth J. Greenaway
2f77b2dc99
Merge pull request #50869 from garethgreenaway/50848_mysql_exception_test
...
[2017.7] Adding a test to ensure exception handling is correct
2018-12-14 15:54:34 -08:00
Gareth J. Greenaway
3767d4ffe3
Merge branch '2017.7' into 50848_mysql_exception_test
2018-12-14 15:54:22 -08:00
Erik Johnson
676a12ac55
Fix compound matching in eauth
...
The auth validation functions were using flawed logic to validate the
expressions configured for a given eauth plugin. To "expand" the
expression, it would use `salt.utils.minions.parse_target()` to analyze
the expression. However, this function was intended to be used on
individual words in a compound expression, not on a compound expression
as a whole. This means that any multi-word compound expression would
fail to validate. By assuming that the euth expression is compound and
using `check_minions()` to get the list of minions that match the
expression, we ensure that it is properly validated.
2018-12-14 16:09:41 -06:00
Gareth J. Greenaway
4242e64680
Merge branch '2017.7' into bp-50740
2018-12-14 14:08:26 -08:00
Gareth J. Greenaway
a5caab7263
Merge pull request #50872 from Ch3LL/bp-50864
...
Backport #50864 to 2017.7
2018-12-14 11:57:47 -08:00
Massimiliano Torromeo
fd73f86c75
Catch UnicodeDecodeErrors in id verification
...
Do not crash if the id cannot be decoded. An invalid id provided by an untrusted client can DOS the master.
2018-12-14 13:23:57 -05:00
Rémi Jouannet
fc9c64b622
fix typo in file.managed documentation
2018-12-14 13:20:46 -05:00
Gareth J. Greenaway
af3e1459c3
Cleanup.
2018-12-14 09:28:44 -08:00
