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
62,378 Commits 24 Branches 182 Tags 341 MiB
edd50a775a
Commit Graph

62378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
edd50a775a Merge pull request #29220 from arthurlogilab/patch-14 
typo in docstring
 2015-11-30 12:22:13 -07:00
Mike Place
a6889cbdcb Merge pull request #29228 from s0undt3ch/develop 
Fix the `engines_dirs` config option name.
 2015-11-30 12:15:25 -07:00
Mike Place
dd07533363 Merge pull request #29248 from sjorge/utils-seasoning 
sprinkle some salt.utils.* magic on salt.states.smartos and salt.modules.vmadm
 2015-11-30 11:40:52 -07:00
Mike Place
c4cf25e033 Merge pull request #29242 from silenius/develop 
use salt.utils.is_freebsd()
 2015-11-30 11:27:48 -07:00
Joseph Hall
8f54eeae8c Merge pull request #29257 from nmadhok/develop-vmware-driver 
VMware cloud driver refactors and doc fixes
 2015-11-29 17:48:32 -07:00
Nitin Madhok
1715342795 Remove useless whitespaces 2015-11-29 18:30:55 -05:00
Nitin Madhok
e30587d054 Updating docs for VMware cloud driver 2015-11-29 18:28:45 -05:00
Nitin Madhok
4fc2986b16 Updating docs for VMware cloud driver 2015-11-29 18:24:09 -05:00
Nitin Madhok
de930de77f Fixing issues with VMware cloud driver 2015-11-29 18:21:05 -05:00
Nitin Madhok
248c090af2 Updating/reorganizing docs for VMware cloud driver 2015-11-29 18:20:26 -05:00
Jorge Schrauwen
600e0fc543 ofcourse also cleanup the unneeded code 2015-11-27 20:02:59 +00:00
Jorge Schrauwen
90c03d28b6 sprinkle some salt.utils.clean_kwargs onto salt.module.vmadm 2015-11-27 20:01:55 +00:00
Jorge Schrauwen
5f5926c9c3 spring the lovely atomic_open on salt.states.smartos 2015-11-27 19:41:39 +00:00
Julien Cigar
6b6a17c76b use salt.utils.is_freebsd() 2015-11-27 12:55:31 +01:00
Pedro Algarvio
d6d3d94b87 Fix the engines_dirs config option name. 2015-11-26 18:31:20 +00:00
Arthur Lutz
2dfdc7e4fa typo in docstring 2015-11-26 12:07:51 +01:00
Mike Place
7bd15621c8 Merge pull request #29192 from bastiaanb/fix/issue-29191-subdict_match-regression 
fix issue 29191: only try partial matches when a wildcard has been sp…
 2015-11-25 13:06:39 -07:00
Mike Place
ccf46a44bb Merge pull request #29185 from jirikotlin/develop 
Support of tunnels in openvswitch modules.
 2015-11-25 10:55:35 -07:00
Mike Place
d18ec83959 Merge pull request #29197 from s0undt3ch/develop 
We can't import functions as we import modules
 2015-11-25 10:46:44 -07:00
Mike Place
a8c917e703 Merge pull request #29195 from pzipoy/dev/pzipoy/windows_dropfile_permissions 
Add windows dropfile support
 2015-11-25 10:44:09 -07:00
Mike Place
89aee406fa Merge pull request #29153 from DSRCompany/features/3077_acl_limit_args 
ACL limit args
 2015-11-25 10:29:35 -07:00
Pedro Algarvio
f756296580 We can't import functions as we import modules 2015-11-25 16:32:31 +00:00
Mike Place
d8be61882e Merge pull request #29158 from bocig/develop 
Fix custom hipchat api endpoint
 2015-11-25 09:24:46 -07:00
Jiri Kotlin
55b81ade59 Support of tunnels in openvswitch modules - removed sudo from commands. 2015-11-25 16:22:52 +00:00
Perry Zipoy
02d9684f8b Add windows dropfile support 
Signed-off-by: Perry Zipoy <perry.zipoy@ni.com>
 2015-11-25 10:20:41 -06:00
Bastiaan Bakker
7052479ad3 remove trailing whitespace 
fix subdict_match test cases
 2015-11-25 17:12:17 +01:00
Mike Place
b5b28fb51a Merge pull request #29189 from sjorge/docs-fmadm 
doc fixes for salt.modules.fmadm
 2015-11-25 08:56:39 -07:00
Bastiaan Bakker
e3af8d2151 fix issue 29191: only try partial matches when a wildcard has been specified 2015-11-25 16:03:33 +01:00
Jorge Schrauwen
ed95e84b2b generate docs for fmadm module 2015-11-25 14:43:38 +00:00
Jorge Schrauwen
e3c5b21f26 add aditional doc info 2015-11-25 14:40:45 +00:00
Jiri Kotlin
2c07b5d516 Support of tunnels in openvswitch modules. 2015-11-25 13:30:49 +00:00
Jiri Kotlin
b2778b01a1 Support of tunnels in openvswitch modules. 2015-11-25 12:48:06 +00:00
Dmitry Kuzmenko
002b1ef9bd Fixed use of assert_has_calls in tests. 
The method logic was changed in mock-1.1.0.
This mades the use of the method compatible with both <1.1.0 and >=1.1.0
 2015-11-25 15:31:20 +03:00
Dmitry Kuzmenko
09c4f69402 ACL test fix. 2015-11-25 12:33:46 +03:00
Colton Myers
8d07688af9 Merge pull request #29171 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-11-24 16:53:01 -07:00
Igor
1b75741eed cleaned up lint errors 2015-11-24 15:52:08 -08:00
Colton Myers
28b40de8da Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/__init__.py
    salt/client/ssh/ssh_py_shim.py
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/vmware.py
    salt/grains/philips_hue.py
    salt/modules/boto_ec2.py
    salt/modules/boto_route53.py
    salt/modules/dracr.py
    salt/modules/philips_hue.py
    salt/proxy/philips_hue.py
    salt/states/virtualenv_mod.py
 2015-11-24 16:07:31 -07:00
Colton Myers
2fb1ca0eac Merge pull request #29167 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-11-24 14:40:34 -07:00
Colton Myers
525f9fbbbb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-11-24 14:39:48 -07:00
Justin Findlay
a26c10a811 Merge pull request #29164 from jfindlay/bp-29113 
Backport #29113
 2015-11-24 14:26:17 -07:00
Mark McGuire
50fab35188 kill unneeded import 2015-11-24 13:28:31 -07:00
Igor
e7278cdd7a cleaned up code to support hosted hipchat server. Added red color for failed runs 2015-11-24 08:37:46 -08:00
Mike Place
68d6c454b8 Merge pull request #29141 from optix2000/full_sls_import 
Add test case for require: sls with only import statements
 2015-11-24 09:17:57 -07:00
Mike Place
3326991479 Merge pull request #29027 from makearl/issue-28796-beacon-config-as-list 
Fix issue 28796 beacon config as list
 2015-11-24 09:06:45 -07:00
Mike Place
732f5364a2 Merge pull request #29072 from terminalmage/issue28311 
Several gitfs/git_pillar fixes
 2015-11-24 09:04:39 -07:00
Mike Place
95689ee1a4 Merge pull request #29118 from ticosax/dockerng-network 
[dockerng] Add networking capabilities
 2015-11-24 08:47:36 -07:00
Mike Place
4b4f212d2d Merge pull request #29145 from alprs/fix-duplicate_import 
Remove duplicate import of salt.utils.s3
 2015-11-24 08:36:05 -07:00
Mike Place
8ddbfd018b Merge pull request #29136 from cachedout/handle_slack_outage 
Handle condition where Slack API may be unstable
 2015-11-24 08:34:35 -07:00
Mike Place
6079569580 Merge pull request #29148 from lomeroe/boto_route53_create_zone_fix-backport 
correcting parameter calls to boto get_zone/create_zone functions in …
 2015-11-24 08:33:53 -07:00
Mike Place
efdc3cc088 Merge pull request #29149 from lomeroe/boto_route53_create_zone_fix 
Boto route53 create zone fix
 2015-11-24 08:29:46 -07:00