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
58,276 Commits 24 Branches 182 Tags 341 MiB
7f96ebd69e
Commit Graph

58276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
7f96ebd69e Merge pull request #27883 from terminalmage/git-merge_base-is_ancestor 
Work around --is-ancestor not being present in git-merge-base before git 1.8.0
 2015-10-13 08:51:27 -06:00
Mike Place
4fb20d9b4f Merge pull request #27877 from rallytime/bp-27774 
Back-port #27774 to 2015.8
 2015-10-13 08:50:45 -06:00
Mike Place
97da0a87e3 Merge pull request #27878 from rallytime/fix-26284 
Use apache2ctl binary on SUSE in apache module
 2015-10-13 08:45:56 -06:00
Mike Place
067968c0e4 Merge pull request #27879 from cro/proxydoc 
Add docs for 2015.8.2+ changes to proxies
 2015-10-13 08:45:30 -06:00
Erik Johnson
45c666e8dd Work around --is-ancestor not being present in git-merge-base before git 1.8.0 
See https://github.com/saltstack/salt/issues/27487#issuecomment-146683397
 2015-10-12 17:05:46 -05:00
Erik Johnson
38d715ec0a Remove redundant SaltInvocationError raises 
Also add a missing exception message in an earlier check.
 2015-10-12 16:10:19 -05:00
C. R. Oldham
5b33df9d19 Add docs for 2015.8.2+ changes 2015-10-12 14:55:19 -06:00
rallytime
87f0d987a3 Use apache2ctl binary on SUSE in apache module 
Fixes #26284
 2015-10-12 14:44:51 -06:00
Erik Johnson
922e2018ef Merge pull request #27731 from cro/dunder_proxy 
Add __proxy__ to replace opts['proxymodule']
 2015-10-12 15:41:22 -05:00
Thayne Harbaugh
d940d87306 Summary is not correctly inspecting return data to identify not responding|connected minions. 
Expands fix in #27099
 2015-10-12 14:06:00 -06:00
C. R. Oldham
ba3e423b87 Missing object item throws an AttributeError not a NameError. 2015-10-12 13:22:15 -06:00
Mike Place
644f003fb2 Merge pull request #27745 from alprs/fix-virtualenv_pip_upgrade 
Add pip_upgrade arg to virtualenv.managed state
 2015-10-12 10:11:02 -06:00
Erik Johnson
698f477336 Merge pull request #27809 from ticosax/remove-dockerng.ps-caching 
[dockerng] Remove dockerng.ps caching
 2015-10-12 11:07:47 -05:00
Erik Johnson
e96d06d71a Merge pull request #27859 from ticosax/clarify-doc-port-bindings 
[dockerng] Clarify doc port bindings
 2015-10-12 11:06:27 -05:00
C. R. Oldham
4cf2b56d5f Lint. 2015-10-12 10:01:01 -06:00
Mike Place
ba2a39d4b7 Merge pull request #27748 from multani/fix-8646 
Fix #8646
 2015-10-12 09:55:57 -06:00
C. R. Oldham
dc07245df2 @rallytime is awesome. Moved proxy=None to end of def minion_mods 2015-10-12 09:50:21 -06:00
Nicole Thomas
ce1493e06b Merge pull request #27850 from rallytime/bp-27722 
Back-port #27722 to 2015.8
 2015-10-12 09:31:58 -06:00
Nicole Thomas
c95437a710 Merge pull request #27851 from rallytime/bp-27771 
Back-port #27771 to 2015.8
 2015-10-12 09:31:06 -06:00
Mike Place
a41b59bf6e Merge pull request #27833 from jfindlay/path_decode 
decode path before string ops in fileclient
 2015-10-12 09:26:39 -06:00
Mike Place
e264db7702 Merge pull request #27837 from jfindlay/true_shell 
reverse truth in python_shell documentation
 2015-10-12 09:25:13 -06:00
Mike Place
faec838744 Merge pull request #27860 from flavio/fix-os-grains-on-suse-and-opensuse 
Fix OS related grains on openSUSE and SUSE Linux Enterprise
 2015-10-12 09:22:59 -06:00
Mike Place
4ac5344c31 Merge pull request #27768 from rallytime/cleanup_bootstrap 
Clean up bootstrap function to be slightly cleaner
 2015-10-12 09:06:54 -06:00
Mike Place
e1bd91e392 Merge pull request #27797 from isbm/isbm-zypper-fixes 
Zypper module clusterfix
 2015-10-12 09:06:02 -06:00
C. R. Oldham
3152d8ee3f Minor loader fix 2015-10-12 08:43:44 -06:00
C. R. Oldham
b15083d719 Flip sense of test for grains load at end of regular minion startup 2015-10-12 08:43:44 -06:00
C. R. Oldham
37c145bcd5 More places where salt.state.State needs a proxy param, sysmod had wrong __proxyenabled__, core grains were checking for proxy the wrong way. 2015-10-12 08:43:44 -06:00
C. R. Oldham
ed23f36279 One more check for presence of __proxy__ 2015-10-12 08:43:44 -06:00
C. R. Oldham
62d9f5092e what was I thinking? 2015-10-12 08:43:09 -06:00
C. R. Oldham
ccf366e1a5 Lint 2015-10-12 08:42:26 -06:00
C. R. Oldham
8aef6e8aa9 Fix comment 2015-10-12 08:42:26 -06:00
C. R. Oldham
48f9755103 Oops, forgot temp var. 2015-10-12 08:42:26 -06:00
C. R. Oldham
f0360ca00e More cleanup, found another spot where proxy needed to be passed to a load_modules. 2015-10-12 08:42:26 -06:00
C. R. Oldham
81a4abfe5a __proxy__ is getting nuked somewhere 2015-10-12 08:42:03 -06:00
C. R. Oldham
f9461ff298 Add config option so old-style proxymodules will keep loading 2015-10-12 08:41:46 -06:00
C. R. Oldham
3d6ed5b7ff Remove debug statement. 2015-10-12 08:41:30 -06:00
C. R. Oldham
b5a19a9740 Enable syncing proxymodules from the master. Proxymodules can go in /srv/salt/_proxy. 2015-10-12 08:40:02 -06:00
C. R. Oldham
f878011543 Lint, and some parameter fixes to add proxy= to some overridden load_modules fns. 2015-10-12 08:40:02 -06:00
C. R. Oldham
22f035d8eb Remove debug statement 2015-10-12 08:39:19 -06:00
C. R. Oldham
4432499b45 More progress toward __proxy__ 2015-10-12 08:38:42 -06:00
C. R. Oldham
1a229c17b2 Further work on __proxy__ 2015-10-12 08:37:49 -06:00
C. R. Oldham
85fd6a41c7 One more check for presence of __proxy__ 2015-10-12 08:34:36 -06:00
C. R. Oldham
15e1d3e3df Forgot absolute_import. 2015-10-12 08:34:36 -06:00
C. R. Oldham
c5d9d54f19 Fix py3 lint 2015-10-12 08:34:36 -06:00
C. R. Oldham
dd50c33543 This module was accidentally overwriting core grains during tests. 2015-10-12 08:34:36 -06:00
C. R. Oldham
525256fa68 Some calls to highstate won't have __proxy__ in scope 2015-10-12 08:34:36 -06:00
C. R. Oldham
a615e5a876 what was I thinking? 2015-10-12 08:34:36 -06:00
C. R. Oldham
fae3f3ca83 Lint 2015-10-12 08:34:36 -06:00
C. R. Oldham
b049377cbe Remove rest_sample_test, it wasn't testing anything 2015-10-12 08:34:36 -06:00
C. R. Oldham
42188480d4 Fix comment 2015-10-12 08:34:36 -06:00