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
95,263 Commits 24 Branches 182 Tags 341 MiB
4114a4f5d8
Commit Graph

95263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Jordan
4114a4f5d8
fixing type in load beacon module and adding option validators to config check function along with mock default values in test 2018-11-02 18:22:55 +00: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
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
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
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
Nicole Thomas
367b6893e5
Merge pull request #32 from tonybaloney/bp50301 
update test assertions
 2018-11-01 09:29:44 -04: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
Nicole Thomas
00437aa9c4
Merge pull request #50315 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.3 to 2018.3
 2018-10-31 10:16:33 -04:00
Anthony Shaw
ba526ad149
remove unused import 2018-10-30 14:38:22 -04:00
Anthony Shaw
220e57f848
create 2 simple unit tests for the netyang state module and fix issue in #47425 2018-10-30 14:38:22 -04:00
Anthony Shaw
20bf3067b9
reproduce bug in 47425 2018-10-30 14:38:22 -04:00
rallytime
422465e53c
Merge branch '2018.3.3' into '2018.3' 
No conflicts.
 2018-10-30 14:36:46 -04:00
Nicole Thomas
1aae681229
Merge branch '2018.3' into bp-50230 2018-10-30 12:26:15 -04:00
Mike Place
84ee7a3038
Merge pull request #50309 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-10-30 17:07:24 +01:00
rallytime
381a59d56e
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/states/pip_state.py
  - tests/integration/cloud/clouds/test_ec2.py
 2018-10-30 11:41:18 -04:00
Nicole Thomas
b805bab25c
Merge pull request #50308 from rallytime/test-fixes 
Fix matcher grain file
 2018-10-30 11:27:46 -04:00
Nicole Thomas
11fa33e41d
Merge pull request #50295 from dubb-b/remove-cloud-change 
Removing an un needed change and maybe fixing the lint error
 2018-10-30 11:27:22 -04:00
rallytime
f23852207f
Fix matcher grain file 
This was inadvertently changed in th filename_map backport.

This commit restores the matcher grain file to match all branches previous
to the inadvertent change.
 2018-10-30 09:51:51 -04:00
Nicole Thomas
57fe6cdb18
Merge pull request #50270 from terrible-broom/feature/apt-cache-show-instead-of-dump 
apt: speedup installing packages with '>=' or '<=' and reduced memory…
 2018-10-30 09:24:35 -04:00
Nicole Thomas
6c1b05ad9e
Lint: add extra blank line 2018-10-30 09:22:24 -04:00
Daniel Wallace
6a65402dac
Merge pull request #50293 from saltstack/jenkins 
update jenkins version for 2018.3
 2018-10-29 18:39:34 -05:00
Daniel Wallace
935f1815a2
Merge pull request #50289 from gtmanfred/2018.3 
ignore empty line in localectl status output
 2018-10-29 16:39:06 -05:00
twangboy
69c02fca4a
Fix some lint and some typos 2018-10-29 15:34:48 -06:00
Brett Benassi
80982ada82
Removing an un needed change and maybe fixing the lint error 2018-10-29 15:30:51 -06:00
Daniel Wallace
fe6fbc43d7
update jenkins version for 2018.3 2018-10-29 16:05:34 -05:00
Anna Martynova
a4df706d1d fix review notes 2018-10-29 23:57:07 +03:00
rallytime
1ef712a178
Add various ssh tests to the filemap for salt/utils/vt.py changes 
Some of the salt-ssh tests use the salt/utils/vt.py functions. A recent
change in that file caused about 90 tests to start failing on the branch.

We need to make sure these tests run when changes to the vt.py util are
made in PRs.
 2018-10-29 16:40:23 -04:00
twangboy
d18401370e
Fix typo 2018-10-29 14:15:07 -06:00
twangboy
92b5ea023e
Create salt util that copies file security info 2018-10-29 14:06:30 -06:00
Daniel Wallace
fb43061cb1
fix test 2018-10-29 14:45:23 -05:00
Daniel Wallace
5eb0e37f4e
add extra space to localemod test 2018-10-29 14:31:36 -05:00
Daniel Wallace
e8dc8baf71
if line in output of localectl is empty, ignore it 2018-10-29 14:29:14 -05:00
Nicole Thomas
10ba8b42a8
Merge pull request #50276 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-10-29 15:05:14 -04:00