Mihai Dinca
6970fe8103
Fix salt-master for old psutil
2017-12-27 16:40:50 -05:00
twangboy
b46845888d
Add libnacl dependency
2017-12-27 13:40:49 -07:00
Nicole Thomas
d3381e27d0
Merge pull request #45118 from garethgreenaway/44728_nodegroups_seq
...
[2016.11] Fix to allow nodegroups to include sequences
2017-12-27 13:49:10 -05:00
lomeroe
0a4c6b5a83
remove references to six.unichr
2017-12-24 20:23:24 -06:00
lomeroe
f3196d795d
lint fixes for static regexes
2017-12-24 10:49:42 -06:00
lomeroe
11b637d108
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-24 10:49:42 -06:00
lomeroe
c14d6282ad
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-24 10:49:42 -06:00
Elias Probst
43d44e051a
Do not blindly assume presence of either /var/run/utmp or /run/utmp, none of both might be available (e.g. on non-booted systems).
2017-12-23 00:34:07 +01:00
Nicole Thomas
fbbf33574e
Merge pull request #44966 from rcallphin/fix-bug-vault-empty-policy
...
Fix bug with vault runner creating token on empty policy
2017-12-22 15:30:36 -05:00
Nicole Thomas
7f327ab760
Lint: Remove extra whitespace
2017-12-22 14:30:28 -05:00
Nicole Thomas
487207f61d
Merge pull request #44552 from Da-Juan/avoid_unneeded_pip_install
...
pip_state: Check if available upgrades fulfill version requirements.
2017-12-22 14:25:16 -05:00
Nicole Thomas
5ae26f0c09
Merge pull request #45090 from angeloudy/2017.7
...
fix TypeError in python 3
2017-12-22 13:11:12 -05:00
Nicole Thomas
a1946730a9
Merge pull request #45134 from garethgreenaway/44315_cmd_script_cwd_with_space
...
[2017.7] fix to cmd.script for cwd with space
2017-12-22 10:31:24 -05:00
Nicole Thomas
f969aca3a3
Merge pull request #45127 from twangboy/win_fix_pkg
...
Fix issue with 1641 return code
2017-12-22 10:18:27 -05:00
Nicole Thomas
dc357b39f0
Merge pull request #45137 from twangboy/win_fix_reg_tests
...
Catch correct error type in list_keys and list_values
2017-12-22 09:45:21 -05:00
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
2017-12-20 09:49:07 +11:00
Frode Gundersen
dfb68f32d2
fix if statements and string
2017-12-19 19:45:19 +00: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
