valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
95,398 Commits 24 Branches 182 Tags 341 MiB
a4fc1087a3
Commit Graph

95398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Gomersbach
d20581c962
Merge branch 'fix-py3-reload-compat' of github.com:mgomersbach/salt into fix-py3-reload-compat 2018-11-03 09:22:20 +01:00
Mark Gomersbach
5cd9741269
Satisfy pylint 2018-11-03 09:21:41 +01:00
Mark Gomersbach
48c6a4f6c0
Merge branch '2017.7' into fix-py3-reload-compat 2018-11-03 09:16:30 +01:00
Daniel A. Wozniak
18b5d43d09
Increase cli batch test timeout for increased reliablity 2018-11-02 17:15:31 -07:00
Daniel Wozniak
99c8f356eb
Merge pull request #50345 from dwoz/pub_d_logging 
Configure logging for ZMQ PubServer daemon
 2018-11-02 12:40:31 -07:00
Gareth J. Greenaway
b8ded8bf5f
Updating the swap function in the mount.swap function also check the device name when checking the fstab data. Updating tests to reflect new behavior. 2018-11-02 12:23:24 -07:00
Gareth J. Greenaway
8885d1ff3d
Merge branch '2018.3' into 41342_beacon_state_module_fixes 2018-11-02 12:08:19 -07:00
Mark Gomersbach
a2838dbd05
Satisfy pylint checks 2018-11-02 17:52:21 +01:00
Shane Lee
3ffa3921b7
Merge pull request #50006 from lomeroe/issue48782_2018.3 
Correct more issues in lgpo
 2018-11-02 10:32:28 -06:00
rallytime
0621f7dd2e
Add a few more feature release codenames to the version_numbers doc 2018-11-02 12:15:53 -04:00
Nicole Thomas
44f7af4897
Merge pull request #50350 from dubb-b/2017.7 
Updating the AMI's and sizes for the test run.
 2018-11-02 09:51:59 -04:00
lomeroe
dc58252e52 update to use a single line if statement when dealing with prepended 
text

add comment on using +2
 2018-11-02 08:03:43 -05:00
lomeroe
0e011ad805 add runTest method to class for PY2 2018-11-02 08:03:43 -05:00
lomeroe
377ec095ab add a test for #47784 2018-11-02 08:03:43 -05:00
lomeroe
0a14505e21 change backslashes in comment string to fix lint error 2018-11-02 08:03:43 -05:00
lomeroe
02181d385a add fix/test for #50079 
ADML display names that have a single match in each Computer/User policy
would not work with the "short" display name, requiring either the
"long" name or the explicit policy name
 2018-11-02 08:03:43 -05:00
lomeroe
05f29511a4 more lint fixes 2018-11-02 08:03:43 -05:00
lomeroe
94b33350a8 lint fixes in test 2018-11-02 08:03:43 -05:00
lomeroe
2a79626538 update test to actually work 
update lgpo module to catch another possible case of multiple ADML names
 2018-11-02 08:03:43 -05:00
lomeroe
42840ecd9b add missing comma in function call 2018-11-02 08:03:43 -05:00
lomeroe
c283f50074 Log a warning message instead of an exception when a SID cannot be 
converted to a username (for user rights assignments)

Add a module test file
 2018-11-02 08:03:43 -05:00
lomeroe
271bd70cf1 capture and print exception information 
in _regexSearchKeyValueCombo use byte ']' when searching for end of
policy configuration in registry.pol file (py3 fix), additionally move 2
characters from ']' location to skip ']' and the '\x00' due to the
utf-16-le encoding to find the end of the element

this was causing _regexSearchKeyValueCombo to return the element without
the ending ']\x00' and if/when the element was replaced two ']\x00'
existed at the end of the element
 2018-11-02 08:03:42 -05:00
lomeroe
bc94b8e296 update method for creating size field of **delvals items for py3 
compatibility
 2018-11-02 08:03:42 -05:00
lomeroe
d9fe28a29a fix clobbering of admx_search_results which was keeping some policies 
from being properly detected

add a handful of debug statements to help with debugging admx/adml
policy discovery

validate text attribute exists on item before joining it with prepended
text
 2018-11-02 08:03:42 -05:00
Daniel A. Wozniak
fd585231a1
Fix linter warnings 
Fixes "Arguments number differs from overridden 'pre_fork' method'
 2018-11-01 23:10:48 -07:00
Daniel A. Wozniak
5e1db3c6a7
Fix ZMQ PubServer daemon logging works on winndows 
Make the api to ZMQ PubServer more similar to tcp pubserver
 2018-11-01 22:16:37 -07:00
Brett Benassi
346a8317b1
Updating the AMI's and sizes for the test run. 2018-11-01 19:05:49 -06:00
Gareth J. Greenaway
c2354a9cb1
Fixing beacon state test. Adding a reset function to beacon module to clear out beacon configuration. Useful for tests runs to ensure bits are left over between runs. 2018-11-01 16:47:02 -07:00
Gareth J. Greenaway
2390f471ce
Adding SaltReturnAssertsMixin back in 2018-11-01 15:22:18 -07:00
Gareth J. Greenaway
677d0908fd
Remove zookeeper reference. 2018-11-01 15:05:42 -07:00
Gareth J. Greenaway
f3dee43bf0
Updating the beacon state module to ensure that the format of the beacon data that is being sent along to the beacon execution module is in the right format. 2018-11-01 15:02:21 -07:00
Daniel A. Wozniak
889983223d
Configure logging for ZMQ PubServer daemon 2018-11-01 13:44:12 -07:00
Nicole Thomas
b947a18500
Merge pull request #50274 from rallytime/bp-41472 
Back-port #41472 to 2017.7
 2018-11-01 15:45:34 -04:00
Nicole Thomas
12de4b99d4
Merge pull request #50340 from garethgreenaway/backport_48087_to_2018_3 
[2018.3] Backporting #48087 to 2018.3
 2018-11-01 14:15:36 -04:00
Mike Place
4725acd4e0
Merge pull request #50195 from damon-atkins/jenkins_pylint 
Jenkins CI Lint capture additional info
 2018-11-01 18:42:59 +01:00
Mike Place
5e464343d3
Merge pull request #50275 from rallytime/bp-49752 
Back-port #49752 to 2018.3
 2018-11-01 17:50:16 +01:00
Mike Place
51e333ada2
Merge pull request #50316 from rallytime/bp-50301 
Back-port #50301 to 2018.3
 2018-11-01 17:32:04 +01:00
Gareth J. Greenaway
56c87ff690
Backporting #48087 to 2018.3 2018-11-01 08:46:31 -07:00
Mark Gomersbach
05c598c75e
Fix import error by utilizing six and strict version spec 2018-11-01 15:05:16 +01:00
Mark Gomersbach
95174e66f4
Merge branch '2017.7' into fix-py3-reload-compat 2018-11-01 14:38:40 +01:00
Nicole Thomas
367b6893e5
Merge pull request #32 from tonybaloney/bp50301 
update test assertions
 2018-11-01 09:29:44 -04:00
Nicole Thomas
ab8e8450c7
Merge pull request #50329 from twangboy/fix_cloud_winrm 
Check WinRM port before initiating connection
 2018-11-01 09:06:41 -04:00
Gareth J. Greenaway
6e96728b52
pkg.installed currently fails when sources is used along with hold: True. This was due to a change in #48426 that swapped out sending the pkgs variable for the desired variable instead. This caused problems with pkg.hold because desired and sources are always populated, and pkg.hold can only include one or the other. This change just includes desired in the call to pkg.hold since desired has the same value for sources. 2018-10-31 15:50:55 -07:00
Anthony Shaw
529687a855
update test assertions 2018-11-01 08:41:53 +11:00
Mike Place
af1075b26d
Merge pull request #50290 from twangboy/fix_test_state 
Fix `test_state` for Windows
 2018-10-31 20:28:33 +01:00
Mike Place
e463d99b3b
Merge branch '2018.3' into bp-49752 2018-10-31 20:24:09 +01:00
Mike Place
045d81c9d3
Merge pull request #50291 from rallytime/bp-50230 
Back-port #50230 to 2018.3
 2018-10-31 20:22:24 +01:00
rallytime
b29fcfabbb
New test must be py3 compatible...oops. :) 2018-10-31 12:52:58 -04:00
twangboy
cf5fb04c04
Check WinRM port before initiating connection 2018-10-31 10:50:42 -06:00
rallytime
c684c298ff
Fix issue #48734 
A regression was caused in the local_cache returner with PR #43454.

PR #43454 fixes an issue where `jobs.lookup_jid` was not working correctly
with external job caches.

However, when this issue was fixed, there was a slight logic error that
was overlooked for the local_cache. This fixes the issue with the local_cache
so that the "Target" and "Target Type" data is restored to their previous
values.
 2018-10-31 12:03:41 -04:00