rallytime
508599e159
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/win_lgpo.py
2017-12-30 08:32:16 -05:00
Nicole Thomas
abed378981
Merge pull request #45204 from garethgreenaway/45176_fixes_to_osquery_module
...
[2017.7] Fixes to osquery module & addition of unit tests
2017-12-30 08:25:37 -05:00
Nicole Thomas
707ef55175
Merge pull request #45161 from lomeroe/bp-44944_2016.11
...
Backport #44944 to 2016.11
2017-12-30 08:19:35 -05:00
Adam Mendlik
66884334d9
Update states.pkg for Python3 compatibility
2017-12-29 07:18:50 -07:00
Adam Mendlik
2a7d76ad6e
Fail pkg.uptodate if expected packages are not upgraded
2017-12-29 07:18:50 -07:00
Adam Mendlik
29ef67bac2
Test pkg.uptodate with failed upgrades
2017-12-29 07:18:50 -07:00
Adam Mendlik
23ab93353b
Produce changes dict for pkg.uptodate dry-run mode
2017-12-29 07:18:49 -07:00
Adam Mendlik
7c67ec39d9
Add tests for pkg.uptodate state
2017-12-29 07:18:49 -07:00
Nicole Thomas
5991d8ca15
Merge pull request #45203 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-28 20:11:02 -05:00
Gareth J. Greenaway
dc933e9e24
Fixing typo
2017-12-28 17:07:38 -08:00
Gareth J. Greenaway
d834bd1b6f
Fixing some minor lint issues.
2017-12-28 17:07:38 -08:00
Gareth J. Greenaway
4738205154
Fixing a bug when attributes are passed to various osquery module functions.
2017-12-28 17:07:38 -08:00
Nicole Thomas
882267314f
Merge pull request #45201 from rallytime/fix-jinja-template-test-failure
...
[2017.7] Check for running on python3 before decoding bytes
2017-12-28 17:59:13 -05:00
Nicole Thomas
2e18398f12
Merge pull request #45200 from rallytime/fix-docstring-test-failure
...
[2017.7] Fix docstring integration test failure
2017-12-28 17:58:33 -05:00
Nicole Thomas
6f52034e08
Merge pull request #45199 from gtmanfred/status
...
status.pid returns pid ids not process names
2017-12-28 14:06:11 -05:00
Nicole Thomas
67d97303b5
Merge pull request #45186 from rallytime/bp-44922
...
Back-port #44922 to 2017.7
2017-12-28 14:02:50 -05:00
rallytime
430c913c8c
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/auth/pam.py
- salt/master.py
- tests/unit/test_target.py
2017-12-28 12:15:54 -05:00
rallytime
b4af3bdff8
Check for running on python3 before decoding bytes
...
Fixes a test failure caused by #45090 :
- unit.templates.test_jinja.TestCustomExtensions.test_http_query
2017-12-28 11:17:44 -05:00
rallytime
a26d4795bd
[2017.7] Fix docstring integration test failure
2017-12-28 10:59:16 -05:00
Daniel Wallace
fb07f9ea7d
status.pid returns pid ids not process names
2017-12-28 08:25:26 -07:00
Nicole Thomas
30d7f7257a
Merge pull request #44624 from eliasp/fix-upstart-utmp-exception
...
Fix Traceback when using the `service.enabled` state on non-booted systems
2017-12-28 05:58:42 -05:00
Nicole Thomas
3832e7b227
Merge pull request #45183 from twangboy/win_add_libnacl_2017.7
...
Add libnacl dependency
2017-12-27 17:08:31 -05:00
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
