Commit Graph

58272 Commits

Author SHA1 Message Date
twangboy
07939ea29c More lint 2015-10-12 17:02:34 -06:00
twangboy
14e060ed9c Fixed some tests 2015-10-12 16:54:10 -06:00
twangboy
1e1bd29426 Fixed some lint 2015-10-12 16:34:40 -06:00
twangboy
082277a727 Win_service.py to use the new task module
Necessary to fix issue with date locale related issues
2015-10-12 15:58:33 -06:00
twangboy
2212b52620 Created win_task.py module
For working with windows task scheduler
Fixes some date problems related to date
2015-10-12 15:53:26 -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
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
C. R. Oldham
4112c583e4 Oops, forgot temp var. 2015-10-12 08:34:36 -06:00
C. R. Oldham
e9b281041c More cleanup, found another spot where proxy needed to be passed to a load_modules. 2015-10-12 08:34:36 -06:00
C. R. Oldham
64f967d731 __proxy__ is getting nuked somewhere 2015-10-12 08:34:36 -06:00
C. R. Oldham
bdffb9f57b Add config option so old-style proxymodules will keep loading 2015-10-12 08:34:36 -06:00