valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,004 Commits 24 Branches 182 Tags 341 MiB
b49d8df210
Commit Graph

94004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
764969ce08
Add a test to confirm that .py files are still loaded correctly 
Also, use USE_IMPORTLIB to gate testing on optimization_order, since
this only works with Python 3.5+.
 2018-08-08 11:22:52 -05:00
Erik Johnson
0f60beb6b6
Fix bad copypasta 2018-08-08 11:22:52 -05:00
Erik Johnson
fbcd142ea2
Add configuration docs for optimization_order config option 2018-08-08 11:22:52 -05:00
Erik Johnson
8af2d580f3
Only compile the suffix_order/map once per LazyLoader instance 
The values that dictate this are module-level globals, so repeating this
every time we refresh the file mapping is unnecessary.
 2018-08-08 11:22:52 -05:00
Erik Johnson
4b95e5f313
Don't put __pycache__ dir in the file list 
This prevents the loader from needlessly trying to process it (which
will fail anyway since it's not a file).
 2018-08-08 11:22:52 -05:00
Erik Johnson
e7c10196da
Quiet the byte compiling for PY2 2018-08-08 11:22:52 -05:00
Erik Johnson
9338370477
Add unit tests for loader optimization levels 2018-08-08 11:22:52 -05:00
Erik Johnson
c3622933c1
PY3: Support different optimization levels 
This uses the optimization_order config option to control which module
is loaded when multiple optimization levels have been installed.
 2018-08-08 11:22:52 -05:00
Erik Johnson
6fc8da5bab
Add optimization_order config option with default value 2018-08-08 11:22:51 -05:00
Erik Johnson
dfe423a1e0
Remove commented-out log message 2018-08-08 11:22:51 -05:00
Nicole Thomas
b49eeca6e9
Merge pull request #49003 from rallytime/boto-test-2017.7 
Back-port #48999 to 2017.7
 2018-08-08 11:35:48 -04:00
Nicole Thomas
b87bf905c2
Merge pull request #49004 from rallytime/boto-test-2018.3 
Port #48999 to 2018.3
 2018-08-08 11:32:46 -04:00
rallytime
9f0b9a1073
Update expected return value in boto test 
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
 2018-08-08 10:44:38 -04:00
rallytime
1a23bb233f
Update expected return value in boto test 
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
 2018-08-08 10:42:57 -04:00
Nicole Thomas
41d9f11eb3
Merge pull request #48999 from rallytime/fix-boto-test 
Update expected return value in boto test
 2018-08-08 10:42:14 -04:00
rallytime
23b66ef8bb
Skip test_jinja_deep_error on Debian 8 
This is a flaky test on Debian 8, so let's skip it for now.
 2018-08-08 10:36:56 -04:00
Nicole Thomas
10c4eca206
Merge branch '2018.3' into 48123_file_directory_recurse_fails_broken_symlink 2018-08-08 09:37:20 -04:00
Nicole Thomas
630f61e625
Merge pull request #48987 from twangboy/fix_48786 
Fix issue with win_iis.create_cert_binding
 2018-08-08 09:29:05 -04:00
rallytime
d0136b1be5
Update expected return value in boto test 
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
 2018-08-08 09:16:55 -04:00
Nicole Thomas
51eed1fdfb
Merge pull request #48988 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.8 to 2017.7
 2018-08-08 08:56:09 -04:00
AVeenstra
5e82685b89
Python 3 related fix in highstate_return.py 
In Python 3 key sets of dicts no longer support indexing:
`TypeError: 'dict_keys' object does not support indexing`
 2018-08-08 13:20:05 +02:00
Travis Paul
80f8a667d1
Handle ifconfig output differently for NetBSD >= 8.0 
The netmask is now returned as part of the IP address
in the ifconfig output.

fixes #48856
 2018-08-08 13:33:13 +08:00
rallytime
df8699e2e7
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-08-07 21:30:24 -04:00
twangboy
86d0836f90
Fix issue with iterating over None 
Sometimes DnsNamesList is None or not present. It was stacktracing while
trying to iterate over it. Now it checks for non iterables.
 2018-08-07 17:56:38 -06:00
Gareth J. Greenaway
a404cc030f
Fixing the issue when using the file.directory state with recurse if the directory contains a broken symbolic link. This fix adds an additional conditional, is_link, before running lsattr since lsattr does not work on symlinks and causes issues when that symlink is broken. 2018-08-07 15:46:24 -07:00
Nicole Thomas
ab1a713bc3
Merge pull request #48934 from terminalmage/issue48777 
Properly handle latin-1 encoding in file diffs
 2018-08-07 17:02:23 -04:00
twangboy
d7c2f476ac
Remove current: version for latest as well 2018-08-07 14:06:14 -06:00
Ch3LL
8269b55b84
remove unnecessary spaces in cmdmod.py docs 2018-08-07 15:54:44 -04:00
Ashley Newton
5c1c311f77 Update Salt Conf ad 2018-08-07 13:49:26 -06:00
Ch3LL
757daf7d7e
add runas macosx warning in 2018.3.3 release notes 2018-08-07 15:49:26 -04:00
Ashley Newton
72dc63c426 Merge branch '2017.7' of https://github.com/saltstack/salt into new_logo_2017.7 2018-08-07 13:45:21 -06:00
Ashley Newton
9f4e78a7b9 Revert "Update saltconf ad" 
This reverts commit 3ab8cdb882.
 2018-08-07 13:44:42 -06:00
Ch3LL
4e9e985b14
Add warning to mac runas docs about escaping characters 2018-08-07 15:24:14 -04:00
Daniel Wallace
10fd4661ff
Merge pull request #48978 from gtmanfred/2017.7 
clean up gemfile
 2018-08-07 14:03:58 -05:00
Nicole Thomas
a1e54634dc
Merge pull request #48976 from rallytime/tornado 
Skip unreliable tornado tests
 2018-08-07 14:55:24 -04:00
twangboy
522ac26459
Fix typo in code comment 2018-08-07 12:51:00 -06:00
Ashley Newton
3ab8cdb882 Update saltconf ad 2018-08-07 12:40:34 -06:00
twangboy
47b2898a85
return empty dict on no changes 2018-08-07 12:25:15 -06:00
Nicole Thomas
22713be9c1
Merge pull request #48979 from rallytime/bp-48959 
Back-port #48959 to 2017.7.8
 2018-08-07 14:11:52 -04:00
Nicole Thomas
bad995462c
Merge pull request #48956 from gtmanfred/openstack 
if booted from volume, use string from image
 2018-08-07 12:39:44 -04:00
Nicole Thomas
5b2423e527
Merge pull request #48959 from rallytime/flaky-tests 
Mark some more tests as flaky
 2018-08-07 12:33:15 -04:00
Daniel Wallace
6108363f82
clean up gemfile 
Remove opennebula, since we are using docker and ec2
Pin winrm to the package since our changes have been released by
upstream
 2018-08-07 11:01:07 -05:00
rallytime
0bd838ab6c
Skip unreliable tornado tests 
Marked as flaky originally, but they're still flaky with undetermined
race-conditions. These are skipped in 2018.3 and forward, so let's skip
them here as well.
 2018-08-07 11:22:18 -04:00
Nicole Thomas
03aa0e49b0
Merge pull request #48970 from Ch3LL/back_48962 
[2017.7.8] Backport #48962
 2018-08-07 11:01:56 -04:00
Erik Johnson
52c64e4d51
Fix to_unicode test 
Since latin-1 is not being automatically decoded, we need to explicitly
pass it on the test.
 2018-08-07 09:57:21 -05:00
Nicole Thomas
e6cea5e3c7
Merge pull request #48968 from rallytime/man-pages 
Update man pages for 2017.7.8 release
 2018-08-07 10:29:07 -04:00
Gareth J. Greenaway
3ce1b8a3c9
Update the elif block to only be true for versions below Debian 9. 2018-08-07 09:58:40 -04:00
rallytime
64fe3be41a
Update man pages for 2017.7.8 release 2018-08-07 09:35:01 -04:00
Nicole Thomas
79994ecab4
Merge pull request #48962 from garethgreenaway/1022_test_service_disable_debian_part_deux 
[2017.7] Fixing tests/integration/modules/test_service.py
 2018-08-07 07:52:51 -04:00
twangboy
6532706d2f
Make the tests run on Linux 2018-08-06 17:55:46 -06:00