valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,722 Commits 24 Branches 182 Tags 341 MiB
c357e37831
Commit Graph

75722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
c357e37831 Add minion config 2017-02-21 11:09:46 -07:00
Thomas S Hatch
539bb2aa80 Add better ssl option docs 2017-02-21 08:48:42 -07:00
Mike Place
d906e8fadb Merge pull request #38949 from clinta/x509-passphrase-bug 
Use signing passphrase as public passphrase when generating self-sign…
 2017-01-25 13:20:57 -07:00
Mike Place
de3b2cc97b Merge pull request #38929 from MTecknology/2016.11 
Fix psutil regressions in 2016.11
 2017-01-25 13:17:40 -07:00
Mike Place
3ec806c003 Merge pull request #38940 from isbm/isbm-sanitizers-fix-and-unit-test 
Isbm sanitizers fix and unit test
 2017-01-25 13:15:55 -07:00
Bo Maryniuk
a112b790fe Fix typo 2017-01-25 21:15:05 +01:00
Mike Place
e420763285 Merge pull request #38944 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-25 12:44:42 -07:00
Mike Place
bd4889ac73 Merge pull request #38900 from cro/px_dunder_201611 
Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ for proxies.
 2017-01-25 12:36:48 -07:00
Clint Armstrong
c8697e38a8 Use signing passphrase as public passphrase when generating self-signed certificates 2017-01-25 14:21:25 -05:00
Mike Place
f94b8798b6 Merge pull request #38918 from thatch45/thorium_typos 
Thorium typos
 2017-01-25 12:00:40 -07:00
Mike Place
32fbb945b7 Merge pull request #38919 from cachedout/issue_38543 
Correctly pass subset to cmd_subset
 2017-01-25 11:59:16 -07:00
Mike Place
6b3c738bfd Merge pull request #38922 from twangboy/fix_vcredist 
Fix 64bit detection, vcredist only on <= 2008
 2017-01-25 11:47:40 -07:00
Mike Place
954658523b Merge pull request #38923 from DSRCorporation/bugs/38371_fix_schedule_return 
Fixed broken __schedule_return handler.
 2017-01-25 11:45:30 -07:00
Michael Lustfield
73a8c6d121 Load core grains only if required. 
As per discussion on github, these grains should only be loaded if
absolutely required.
 2017-01-25 12:24:20 -06:00
Mike Place
828e9bd8f9 Merge pull request #38927 from l2ol33rt/debian_doc_fix 
Adding explicit install of python-systemd in jessie-backports on Debian Guide
 2017-01-25 11:21:17 -07:00
rallytime
ee33a53a64 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - tests/unit/doc_test.py
 2017-01-25 09:43:12 -07:00
Bo Maryniuk
47a16916c3 Add unit test 2017-01-25 15:44:38 +01:00
Bo Maryniuk
046c5436eb Fix leading dots on sanitized hostname 2017-01-25 15:42:08 +01:00
Michael Lustfield
4966011cb5 Modules might still be needed, even if psutil loads. 2017-01-24 23:04:09 -06:00
Michael Lustfield
fb0432fd21 Fixes a regression with old versions of python-psutil. 2017-01-24 23:00:09 -06:00
Robert James Hernandez
9cc9c6110d Adding explicit call to python-systemd in jessie-backports 2017-01-24 14:25:45 -08:00
Dmitry Kuzmenko
b18f675486 Fixed broken __schedule_return handler. 2017-01-24 21:57:00 +03:00
twangboy
214e1cc598 Fix 64bit detection, vcredist only on <= 2008 2017-01-24 11:56:11 -07:00
C. R. Oldham
9a86fddfa1 Remove extra call to salt.loader.utils. 2017-01-24 11:40:02 -07:00
Mike Place
a555de7c56
Correctly pass subset to cmd_subset 
Fixes #38543
 2017-01-24 10:52:21 -07:00
Thomas S Hatch
0b4aca9145 fix some minor typos in the thorium docs 2017-01-24 10:05:23 -07:00
Thomas S Hatch
58a18e2b58 Add test= True to the master so that thorium does not stack trace 2017-01-24 10:03:53 -07:00
Mike Place
405d86a2ca Merge pull request #38847 from terminalmage/issue38825 
Catch MinionError in file.source_list
 2017-01-24 09:03:09 -07:00
Mike Place
b5df104fc2 Merge pull request #38875 from terminalmage/issue36121 
Reactor: fix traceback when salt:// path is nonexistant
 2017-01-24 08:23:38 -07:00
Mike Place
5ff5e97598 Merge pull request #38889 from cro/vmware_reset_vm_201611 
Backport #38887 to 2016.11: Call correct function for resetting a VM
 2017-01-24 08:20:28 -07:00
Mike Place
e9ebec4d80 Merge pull request #38890 from cro/vmware_reset_vm_20163 
Backport  #38887 to 2016.3: Enable resetting a VM via salt-cloud & VMware driver
 2017-01-24 08:15:34 -07:00
Mike Place
53d0aa8855 Merge pull request #38891 from UtahDave/fix_cassandra_protocol_version 
Proper function parameter default
 2017-01-24 08:06:08 -07:00
Mike Place
c680ee3174 Merge pull request #38904 from terminalmage/docs 
Add top file merging docs to the master config file documentation
 2017-01-24 07:59:25 -07:00
Erik Johnson
42a3652620 Add top file merging docs to the master config file documentation 
Also put the top file stuff in its own section of the minion config
file, along with a message explaining that these options are only used
in masterless salt.
 2017-01-23 20:38:03 -06:00
C. R. Oldham
f4ba89735c Resolve merge conflict 2017-01-23 16:32:23 -07:00
Erik Johnson
11a47803ce Use log.exception() instead 2017-01-23 16:26:45 -06:00
Erik Johnson
fbc4d2a2c4 reactor: ensure glob_ref is a string 
When path does not exist, cp.cache_file returns False, which will cause
a traceback when we attempt to glob that path.
 2017-01-23 16:16:31 -06:00
Erik Johnson
2e443d79a3 cp.cache_file: add note re: return for nonexistant salt:// path 2017-01-23 16:16:31 -06:00
C. R. Oldham
0146562fb4 Call correct function for resetting a VM 2017-01-23 13:09:29 -07:00
David Boucha
c475609683 Proper function parameter default 
Change `protocol_version` default to `None` because `protocol_version`
is determined below and has the same default.

ZD #1159
 2017-01-23 13:05:38 -07:00
C. R. Oldham
76a9920a6b Call correct function for resetting a VM 2017-01-23 13:04:19 -07:00
Mike Place
41a3055213 Merge pull request #38885 from meaksh/2016.11-fix-tests-issues 
Increasing timeouts for running integrations tests
 2017-01-23 11:59:49 -07:00
Mike Place
bde6d3eee7 Merge pull request #38639 from isbm/isbm-disable-custom-roster-for-api-2016.11 
Isbm disable custom roster for api 2016.11
 2017-01-23 11:59:10 -07:00
Mike Place
c3fbfcd231 Merge pull request #38883 from techhat/dontrequire 
Don't require text_out path to exist
 2017-01-23 11:20:41 -07:00
Pablo Suárez Hernández
4311b0b6de Increasing timeouts for running integrations tests 2017-01-23 16:55:48 +00:00
Mike Place
6430a45196 Merge pull request #38851 from terminalmage/docker-py-2.0 
Support docker-py 2.0 in dockerng
 2017-01-23 09:48:11 -07:00
Joseph Hall
67bc4d6687 Don't require text_out path to exist 2017-01-23 09:47:54 -07:00
Mike Place
ec59ae67c8 Merge pull request #38859 from alxwr/2016.11 
fix parsing of sockstat -4
 2017-01-23 09:47:22 -07:00
Mike Place
5fe6db6201 Merge pull request #38850 from techhat/stripcache 
Strip .p from cache file names
 2017-01-23 09:28:45 -07:00
Alexander Weidinger
30fe5641c7 fix parsing of sockstat -4 2017-01-22 02:06:25 +01:00