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
91,783 Commits 24 Branches 182 Tags 341 MiB
02baa76595
Commit Graph

91783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gareth J. Greenaway
02baa76595
Fixing a bug that occured when a comment was added to a message sent to Slack by Salt. Also making slack_engine:groups_pillar optional. 2018-04-16 15:39:20 -07:00
Mike Place
7bfa608e9f
Merge pull request #47062 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-04-16 13:58:31 -06:00
Mike Place
fa27e64a33
Merge pull request #47066 from terminalmage/issue46979 
Fix regression in handling of environment/saltenv
 2018-04-16 13:57:11 -06:00
rallytime
59f5880e72
lint fix 2018-04-13 15:53:34 -04:00
Nicole Thomas
8761b81a69
Merge pull request #47051 from rallytime/fix-lint 
Simplify LooseVersion check in `__virtual__` check in mac_assistive module
 2018-04-13 15:43:32 -04:00
Nicole Thomas
bbb8018b55
Merge pull request #47057 from corywright/fix-minionfs-whitelist-docs 
Fix copy/paste typo in minionfs tutorial
 2018-04-13 15:43:00 -04:00
Erik Johnson
5c4c0468ad
Fix regression in handling of environment/saltenv 
This was broken sometime between when the change was made and 2018.3.0
was released. This fixes the issue and adds a regression test.
 2018-04-13 13:44:55 -05:00
rallytime
1ddf8c584b
Update old utils files to new new utils files path 2018-04-13 12:32:05 -04:00
rallytime
28a79ebba4
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/win_lgpo.py
  - salt/netapi/rest_tornado/saltnado.py
 2018-04-13 12:30:51 -04:00
Cory Wright
9b7ee97d12
Fix copy/paste typo in minionfs tutorial 2018-04-13 11:52:41 -04:00
Nicole Thomas
1700a10ebe
Merge pull request #46326 from kstreee/fix-client-local 
Fixes a timing bug of saltnado's client local.
 2018-04-13 09:59:27 -04:00
Nicole Thomas
d5afa4a2c5
Merge pull request #47046 from clan/file_diff 
switch order of file to be diffed
 2018-04-13 09:40:12 -04:00
Nicole Thomas
ec9251ecd3
Merge pull request #47048 from OrlandoArcapix/Issue46985-fix-grafana4-state 
Issue46985 fix grafana4 state
 2018-04-13 09:34:28 -04:00
Nicole Thomas
d8c4c221cf
Merge pull request #47017 from Unity-Technologies/hotfix/pip_windows 
Don’t encode a unicode string
 2018-04-13 09:31:32 -04:00
rallytime
d52b3689d9
Simplify LooseVersion check in __virtual__ check in mac_assistive module 2018-04-13 09:17:43 -04:00
Orlando Richards
259d747414 Remove accidentally added copy of a file 2018-04-13 11:29:35 +01:00
Orlando Richards
6c8c3da74d Return an empty dict instead of 'None' from grafana4 states 
Fixes #46985
 2018-04-13 09:55:54 +01:00
Z. Liu
bb58605c54 switch order of file to be diffed 2018-04-13 07:00:24 +00:00
Mike Place
5b7544eaa0
Merge pull request #47019 from rallytime/bp-46919 
Back-port #46919 to 2018.3
 2018-04-12 13:43:00 -06:00
Mike Place
ac2d54d78a
Merge pull request #47029 from terminalmage/issue46859 
ldapmod.py/ldap3.py: Force modlist for search/modify/etc. to be str types
 2018-04-12 13:41:28 -06:00
Nicole Thomas
e6e07720fa
Merge pull request #46930 from dwoz/crptodomekeyfix 
Clean up bad public key headers
 2018-04-12 14:57:36 -04:00
Nicole Thomas
0e43becc12
Merge pull request #47008 from garethgreenaway/46951_fixing_slack_engine_aliases 
[2018.3] Fixing aliases in slack engine
 2018-04-12 11:24:39 -04:00
Nicole Thomas
c33de7c82d
Merge pull request #47009 from garethgreenaway/46947_slack_documentation_update_catch_non_dicts 
[2018.3] fixes to slack engine documentation
 2018-04-12 11:20:53 -04:00
Gareth J. Greenaway
f2e484ed54
Merge branch '2018.3' into crptodomekeyfix 2018-04-12 08:12:00 -07:00
Nicole Thomas
c3c00316c5
Merge pull request #46913 from lomeroe/2017_7-fix46877 
2017.7 Fix #46877 -- win_lgpo start/shutdown script reading
 2018-04-12 11:10:49 -04:00
Nicole Thomas
9e37cfc9d6
Merge pull request #47025 from terminalmage/fix-server_id-windows 
Fix server_id grain in PY3 on Windows
 2018-04-12 11:07:59 -04:00
Nicole Thomas
2e193cfb45
Merge pull request #47027 from rallytime/bp-44508 
Back-port #44508 to 2017.7
 2018-04-12 11:05:50 -04:00
Nicole Thomas
68d17c71f1
Merge pull request #47023 from rallytime/bp-46997 
Back-port #46997 to 2018.3
 2018-04-12 11:05:23 -04:00
Nicole Thomas
9cf3c6406a
Merge pull request #47026 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-04-12 10:39:40 -04:00
Daniel Wallace
d3be828696
Merge pull request #47021 from garethgreenaway/920_state_module_jinja_filters_test_test_path_which 
[2018.3] Fixing integration.modules.test_state_jinja_filters.StateModuleJinjaFiltersTest.test_path_which
 2018-04-12 08:12:38 -05:00
Daniel Wallace
385fe2bc1e
Merge pull request #47020 from rallytime/bp-46970 
Back-port #46970 to 2017.7
 2018-04-11 16:48:24 -05:00
Nicole Thomas
66e8445b82
Merge pull request #47022 from corywright/add-auth-file-module-to-docs 
Add auth.file module to auth documentation page
 2018-04-11 17:11:09 -04:00
Erik Johnson
ab6314247b
ldapmod.py/ldap3.py: Force modlist for search/modify/etc. to be str types 2018-04-11 14:55:48 -05:00
Erik Johnson
7691dee4ed
Add to_str option to decode funcs 
This allows for the string to be forced to a str type instead of
unicode on PY2.
 2018-04-11 14:41:54 -05:00
rallytime
ba70df9d62
Use msgpack utils for loads call, import msgpack for UnpackValueError 2018-04-11 14:38:32 -04:00
zbroch
8e72f362f4
Add priority field to support the latest capirca. 2018-04-11 12:47:48 -04:00
zbroch
112f92baab
Add priority field to support the latest capirca. 2018-04-11 12:47:48 -04:00
rallytime
34a478dfe5
Update old fopen path with new utils files path 2018-04-11 12:44:04 -04:00
rallytime
590c7fc13f
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/state.py
  - salt/utils/files.py
  - tests/integration/modules/test_pip.py
 2018-04-11 12:41:22 -04:00
Erik Johnson
cb0cf89ed3
Fix server_id grain in PY3 on Windows 
https://github.com/saltstack/salt/pull/46649 caused a regression on
Windows since the executable path does not exist. This fixes that grain
on Windows by using `sys.executable`.
 2018-04-11 11:33:12 -05:00
Luke Carrier
c2c60f4ffc
Fix respository (=> repository) typo in sls_build 
This typo looks to have been introduced with 64aa4fb and would affect
anyone relying on the deprecated "name" attribute.
 2018-04-11 11:54:30 -04:00
Cory Wright
bd0918fc40
Add auth.file module to auth documentation page 2018-04-11 11:40:00 -04:00
Gareth J. Greenaway
2ccf2c5fe0
Fixing test_path_which to check that the filter is available rather than results. 2018-04-11 08:19:07 -07:00
Gareth J. Greenaway
9373dff52b
Update test_pkgrepo.py 2018-04-11 10:55:36 -04:00
Gareth J. Greenaway
13cf9eb5b1
Removing debugging. 2018-04-11 10:55:36 -04:00
Gareth J. Greenaway
a61a8593e5
Removing suse from pkgrepo comments tests. the pkgrepo functions in SUSE pkg module do not support comments. 2018-04-11 10:55:36 -04:00
Nicole Thomas
12ecfdee93
Merge pull request #45774 from twangboy/mac_add_service_util 
Fix __virtual__ issue in mac_system.py
 2018-04-11 10:26:12 -04:00
Nicole Thomas
8f994e7cf9
Merge pull request #46539 from jfoboss/patch-1 
#46504 Fix
 2018-04-11 10:13:23 -04:00
Nicole Thomas
79347f108a
Merge pull request #47012 from terminalmage/issue46953 
Azure: ensure subscription_id is a str type
 2018-04-11 09:57:07 -04:00
Adam Bolte
6837d6c138
Replace failing is and is not tests with == and != 
With the introduction of unicode_literals, these str to unicode
comparisons were incorrectly always returning False.

Fixes #46917.
 2018-04-11 09:55:18 -04:00