valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
84,777 Commits 24 Branches 182 Tags 341 MiB
cdda66d759
Commit Graph

84777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
b6f4ef8d73
Catch correct error type in list_keys and list_values 2017-12-21 18:44:23 -07:00
Gareth J. Greenaway
48eafe3206
Adding some tests to tests cmd.script with cwd 2017-12-21 15:53:38 -08:00
twangboy
35a417f510
Fix win_dacl problems with SIDs 
Fixes the SID for NULL SID (S-1-0-0)
If there is no name mapping for a SID, just return the SID in the
_ace_to_dict function
 2017-12-21 16:44:52 -07:00
Gareth J. Greenaway
8dfcf71b08
Adding _cmd_quote to handle cases when the current working directory for cmd.script might have a space in it. 2017-12-21 15:11:28 -08:00
Nicole Thomas
f41adfc913
Merge pull request #44964 from Giandom/2017.7-added-highstate-output-to-slack-engine 
added-highstate-output-to-slack-engine
 2017-12-21 16:32:01 -05:00
Nicole Thomas
0aa1662731
Merge pull request #45130 from rallytime/api-groups 
Resolve groups for salt api
 2017-12-21 15:38:31 -05:00
twangboy
14639739f2
Fix issue with 1641 return code 
Use six.text_types instead of str
Fix issue where `_to_mcbs` needed to be used instead of `_to_unicode` in
reg.py that was causing a stack trace for some software
 2017-12-21 13:01:33 -07:00
Nicole Thomas
b49ee97938
Merge pull request #45124 from gtmanfred/2017.7 
enable using kitchen-salt with ec2 on 2017.7
 2017-12-21 14:11:27 -05:00
Daniel Wallace
d0586013eb
fix pylint 2017-12-21 10:40:54 -07:00
Gareth J. Greenaway
0ff811de70
Swapping import to be the old path for 2016.11 2017-12-21 08:17:53 -08:00
rallytime
2dcc8df845
Resolve groups for salt api 2017-12-21 10:20:23 -05:00
Daniel Wallace
59e2e56d13
chmod the xml files before trying to copy 2017-12-21 08:17:10 -07:00
Nicole Thomas
7dc3cc4641
Merge pull request #45114 from twangboy/win_fix_pam 
Move pam library load to try/except block
 2017-12-21 09:37:17 -05:00
Daniel Wallace
a5c1410e23
catch IOError when copying xml files back 2017-12-20 18:26:18 -07:00
Gareth J. Greenaway
b3e2f388f5
Fix to allow nodegroups to include sequences 2017-12-20 16:56:16 -08:00
Daniel Wallace
23bd38ad66
enable using kitchen-salt on ec2 
These changes are needed to run the test suite on ec2 using sudo.
 2017-12-20 17:18:39 -07:00
Nicole Thomas
42e894570d
Merge pull request #45087 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-12-20 17:24:50 -05:00
twangboy
cf5eae1f77
Move pam library load to try/except block 
Because there is no pam library in Windows this was causing a stack
trace to occur
 2017-12-20 15:12:32 -07:00
Nicole Thomas
9550e742ac
Merge pull request #45112 from Ch3LL/fix-arch 
Fix spm big file build test to check /tmp
 2017-12-20 17:09:20 -05:00
Ch3LL
1bd7110a14
Fix spm big file build test to check /tmp 2017-12-20 14:40:10 -05:00
Nicole Thomas
71f9c7ee49
Merge pull request #45068 from rallytime/bp-44976 
Back-port #44976 to 2017.7
 2017-12-20 11:31:21 -05:00
rallytime
fe81e2d39a
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-12-20 10:26:10 -05:00
Nicole Thomas
7e128e8f15
Merge pull request #45100 from rallytime/bp-45070 
Back-port #45070 to 2016.11
 2017-12-20 09:55:00 -05:00
Erik Johnson
54a33c0e1d
Merge pull request #45099 from rallytime/bp-44983 
Back-port #44983 to 2017.7
 2017-12-20 08:41:21 -06:00
Erik Johnson
bdf93f339d
Merge pull request #45098 from rallytime/bp-45092 
Back-port #45092 to 2016.11
 2017-12-20 08:40:51 -06:00
Vernon Cole
0bdb46dab9
add clouds modules to index 2017-12-20 06:58:09 -05:00
Victor
23361de8a2
Ref:44961 - Modified archive.tar to add dest argument at the end of the tar cmd. 2017-12-20 06:56:19 -05:00
Erik Johnson
80b6bd6813
Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install 
Carbon 1.1.1 for some reason added six to their setup.py, which breaks
this test since it's not installed into the virtualenv. This PR forces
this test to use a version of carbon which does not dep on six in its
setup.py.
 2017-12-20 06:54:30 -05:00
angeloudy
cf411f8984
Merge branch '2017.7' into 2017.7 2017-12-20 09:51:34 +11:00
angeloudy
177fd18671
fix TypeError in python 3 
move 383d1e9970 to 2017.7
python3 expect str instead of bytes
 2017-12-20 09:49:07 +11:00
rallytime
4f21a2bbfd
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/windows/installer/Salt-Minion-Setup.nsi
  - salt/runners/manage.py
 2017-12-19 12:57:51 -05:00
Nicole Thomas
e0d7b330fa
Merge pull request #44650 from frogunder/status 
add status.pid test
 2017-12-19 11:21:08 -05:00
Nicole Thomas
49a6a8f02e
Merge branch '2017.7' into avoid_unneeded_pip_install 2017-12-19 11:19:57 -05:00
Nicole Thomas
324b7d4058
Merge pull request #44078 from rossengeorgiev/fix-41044 
user.present: allow date param to be 0
 2017-12-19 10:59:28 -05:00
Nicole Thomas
48a59761df
Merge pull request #44970 from rallytime/update-bootstrap-script 
Update bootstrap script to latest release: 2017.12.13
 2017-12-19 10:49:05 -05:00
Nicole Thomas
422d8b8f1b
Merge pull request #44944 from lomeroe/update_regpol_encoding 
win_lgpo registry.pol encoding updates
 2017-12-19 09:42:48 -05:00
Nicole Thomas
637fdaed58
Merge pull request #45069 from rallytime/bp-45040 
Back-port #45040 to 2016.11
 2017-12-19 09:25:57 -05:00
Chris Fane
de53c45c29 Backport #27160 to 2016.11 2017-12-18 21:07:06 +00:00
Jan Harasym
aa438e1605
Installation Fails on headless machines. 
Installation fails on headless machines if `/passive` is set, `/passive` will display an installation progress bar on windows desktop. `/quiet` suppresses the GUI and does not fail when there is no desktop session available. Fixes #45036.
 2017-12-18 13:56:58 -05:00
Tom Williams
0ca0f37805
44303 - resolves #44303 2017-12-18 13:54:17 -05:00
Nicole Thomas
d9a4b9681e
Merge pull request #44938 from The-Loeki/libcloud_dns_fixes 
Libcloud dns fixes
 2017-12-18 10:47:18 -05:00
Ronald van Zantvoort
276e8828ae
libcloud_dns: pylint fix 2017-12-18 14:32:04 +01:00
Ronald van Zantvoort
c994423286
Merge branch '2017.7' into libcloud_dns_fixes 2017-12-18 12:49:33 +01:00
Ronald van Zantvoort
c72db283d5
libcloud_dns: Further fixes to state output, pylint fixes 2017-12-18 12:40:55 +01:00
rcallphin
04ab6a5e9d
Merge branch '2017.7' into fix-bug-vault-empty-policy 2017-12-16 09:57:37 -07:00
Nicole Thomas
5137be01ec
Merge pull request #44951 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-12-16 08:16:23 -05:00
lomeroe
07d04c7bc7 lint fixes for static regexes 2017-12-15 15:04:51 -06:00
lomeroe
d17c46ce41 lint fixes 
encode some of the more used characters in variables and re-use instead
of re-encoding them over and over

remove a line that was commented out
 2017-12-15 15:04:51 -06:00
lomeroe
ab8e431729 do not decode registry.pol file wholesale, but instead decode individual 
elements of the file

also fix issue where the get_policy_info function would not find
policies in the policy_data class by their "short" name (i.e. the key
name in the dict)
 2017-12-15 15:04:51 -06:00
Nicole Thomas
4d6d640381
Merge pull request #44969 from rallytime/bp-41305 
Back-port #41305 to 2016.11
 2017-12-15 12:22:17 -05:00