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,540 Commits 24 Branches 182 Tags 341 MiB
cfadda0c0c
Commit Graph

58540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
3b4d86467b Merge pull request #27927 from lyft/boto_secgroup-fixes-2015.8 
Do not manage ingress or egress rules if set to None
 2015-10-14 08:03:17 -06:00
Mike Place
b0f9db409d Merge pull request #27928 from rallytime/bp-27908 
Back-port #27908 to 2015.8
 2015-10-14 08:00:50 -06:00
Erik Johnson
2d0b16559e Merge pull request #27676 from ticosax/no-more-arg-to-docker-start 
[dockerng] WIP No more runtime args passed to docker.start()
 2015-10-14 08:38:41 -05:00
Ryan Lane
0fedcc9a0b Update docs 2015-10-13 15:53:22 -07:00
Ryan Lane
9cc65bba76 Do not manage ingress or egress rules if set to None 2015-10-13 15:51:11 -07:00
Andrew
7febb06223 Sneaky white space 
Using the web based editor and some white space found its way in.
 2015-10-13 16:50:47 -06:00
Andrew
31d54bbe63 Note kwags for mdadm in state 
already documented in module, just copy over
 2015-10-13 16:50:39 -06:00
Nathan W
30e6b055ec Small documentation error fixed 2015-10-13 16:44:31 -06:00
Colton Myers
722327ee5f Merge pull request #27885 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-10-13 16:44:20 -06:00
C. R. Oldham
cca310eee0 WIP modules and states for managing Dell FX2 chassis via salt-proxy 2015-10-13 16:00:00 -06:00
Colton Myers
5ecd5615f2 Remove failing heavily-mocked test 2015-10-13 15:08:40 -06:00
rallytime
13a9bc9053 Use eipalloc instead of eni in EC2 interface properties example 
Fixes #27815
 2015-10-13 14:46:01 -06:00
Aditya Kulkarni
0b721efe37 Set default 2015-10-13 16:15:42 -04:00
Nicolas Delaby
a1d0ba392f fixup! Do not pass any argument to docker.start 2015-10-13 20:53:11 +02:00
Nicolas Delaby
8cddbb15c4 prevent potential error while reporting mismatch versions to user. 2015-10-13 20:03:15 +02:00
Nicolas Delaby
65c8762e1f Do not pass any argument to docker.start 
docker.create is responsible to manage all of them, since docker API 1.16
 2015-10-13 19:39:32 +02:00
Nicolas Delaby
d8cca2a009 docker.version_info is now provided. 2015-10-13 19:34:24 +02:00
Mike Place
36f05fb526 Merge pull request #27882 from twangboy/win_task_module 
Created win_task.py module
 2015-10-13 10:54:13 -06:00
twangboy
56c3f3ebb2 Fixed an egregious error with an import 2015-10-13 09:57:10 -06:00
Mike Place
577191696d Merge pull request #27802 from terminalmage/issue27738 
Correct warning logging when update lock is present for git_pillar/winrepo, add runner function for clearing git_pillar/winrepo locks
 2015-10-13 09:09:11 -06:00
Mike Place
d655bb3616 Merge pull request #27886 from rallytime/fix-26632 
Handle group lists as well as comma-separated group strings.
 2015-10-13 09:00:09 -06:00
Mike Place
41cccb3a30 Merge pull request #27876 from terminalmage/git_pillar-AttributeError-2015.5 
2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used
 2015-10-13 08:58:45 -06:00
Mike Place
a158cd50e6 Merge pull request #27746 from alprs/fix-timedatectl_failure 
timezone module: handle timedatectl errors
 2015-10-13 08:55:27 -06:00
Mike Place
9dc19caa79 Merge pull request #27816 from alprs/fix-reboot_delay 
Make system.reboot use `shutdown -r` when available
 2015-10-13 08:52:06 -06:00
Mike Place
dd92b8a2e3 Merge pull request #27874 from rallytime/deprecation-docs 
Add mention of Periodic Table naming scheme to deprecation docs
 2015-10-13 08:51:45 -06:00
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
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
rallytime
d235abf907 Handle group lists as well as comma-separated group strings. 
Fixes #26632
 2015-10-12 16:30:50 -06:00
Colton Myers
3b5e16db67 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/modules/postgres.py
    salt/states/postgres_user.py
 2015-10-12 16:24:05 -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
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
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
Andreas Lutro
04ef51e524 make system.reboot use shutdown -r when available 
see issue #27710
 2015-10-12 21:54:42 +02:00
Erik Johnson
07794c837a 2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used 
If the new gitfs-backed git_pillar configuration schema is used, the
Maintenance process will endlessly crash and restart itself because of a
traceback raised when parsing the ext_pillar configuration. This commit
fixes that by catching the AttributeError and logging an error to the
master log.
 2015-10-12 14:30:20 -05:00
C. R. Oldham
ba3e423b87 Missing object item throws an AttributeError not a NameError. 2015-10-12 13:22:15 -06:00
rallytime
8c056ba501 Add mention of Periodic Table naming scheme to deprecation docs 2015-10-12 13:08:50 -06:00
Andreas Lutro
f616b550b2 lint - use indexed curly brace formatting 2015-10-12 20:53:32 +02:00
Justin Findlay
bc0f167850 update timezone mod unit tests for errors 2015-10-12 11:39:03 -06:00
Erik Johnson
1dbc3b5489 Fix comment in docstring that trailed off mid-sentence 2015-10-12 12:35:09 -05:00
Mike Place
c9c3b7760e Merge pull request #27726 from jfindlay/hashhosts 
deprecate hash_hostname in favor of hash_known_hosts
 2015-10-12 10:19:09 -06:00