valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,547 Commits 24 Branches 182 Tags 341 MiB
f3c8ba85dc
Commit Graph

57547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
f3c8ba85dc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/opennebula.py
    salt/modules/systemd.py
    salt/utils/aws.py
 2015-08-17 17:06:59 -06:00
Mike Place
b3335d627f Merge pull request #26400 from rallytime/bp-26318 
Back-port #26318 to 2015.8
 2015-08-17 15:17:50 -06:00
Mike Place
a16a506ce6 Merge pull request #26397 from s0undt3ch/2015.8 
A single `isinstance()` check for all types is enough
 2015-08-17 14:45:17 -06:00
Mike Place
8abb1f682c Merge pull request #26385 from gtmanfred/2015.8 
don't require volume endpoint in nova driver
 2015-08-17 14:41:03 -06:00
Mike Place
682e12ab7d Merge pull request #26399 from s0undt3ch/hotfix/log-handlers-loader-improvements 
Make `__grains__` and `__salt__` available for log_handler modules
 2015-08-17 14:36:30 -06:00
Mike Place
f2b26a6b49 Merge pull request #26394 from codehotter/register-image 
add register_image function
 2015-08-17 14:35:56 -06:00
Mike Place
7b9158f1dc Merge pull request #26395 from terminalmage/fix-faq 
Fix wording of windows minion restart in FAQ
 2015-08-17 14:35:19 -06:00
C. R. Oldham
ac25a84aa2 Merge pull request #26287 from techhat/spmloaders 
Break out SPM components into loaders
 2015-08-17 14:33:40 -06:00
rallytime
2c8032887f Added versionadded directive for new masked funciton. 2015-08-17 14:01:16 -06:00
Evgeny Vereshchagin
ab4d6e5323 Fix service.enable for masked services 2015-08-17 14:00:20 -06:00
Shane Lee
665ddb3e75 Merge pull request #26384 from TheBigBear/patch-7 
Fix shell quoting for cmd.run
 2015-08-17 13:49:39 -06:00
Justin Findlay
ac8c6a2bf1 Merge pull request #26391 from rallytime/bp-26367 
Back-port #26367 to 2015.8
 2015-08-17 13:39:41 -06:00
Pedro Algarvio
54ad6532f2 Make __grains__ and __salt__ available for log_handler modules 
Refs #26390
 2015-08-17 20:29:25 +01:00
Daniel Wallace
9c3d85f0fd fixing extra variables 2015-08-17 14:28:40 -05:00
Emanuel Rietveld
4382e290e0 add register_image function 2015-08-17 21:25:35 +02:00
Mike Place
740e7aa82f Merge pull request #26355 from gtmanfred/batch 
add batch to orchestrate runner
 2015-08-17 13:22:11 -06:00
Mike Place
17f4bf135f Merge pull request #26388 from rallytime/version-26312 
Add versionadded directives for #26312
 2015-08-17 13:09:41 -06:00
Mike Place
9a63389d7a Merge pull request #26383 from rallytime/fix-26369 
Allow the creation of a VM without a profile
 2015-08-17 13:05:25 -06:00
Mike Place
b62b2d6797 Merge pull request #26318 from evverx/enable-masked-services 
Fix service.enable for masked services
 2015-08-17 12:57:43 -06:00
Pedro Algarvio
51f6a3968c A single isinstance() check for all types is enough 2015-08-17 19:56:51 +01:00
Thomas S Hatch
9d64b419d2 Merge pull request #26272 from garethgreenaway/schedule_list_show_jobs_enabled 
Fixes to schedule module
 2015-08-17 12:54:24 -06:00
Mike Place
503645a72e Merge pull request #26375 from s0undt3ch/2015.8 
[2015.8] Schema DictItem required attribute fixes
 2015-08-17 12:53:19 -06:00
Mike Place
59c1e86087 Merge pull request #26363 from garethgreenaway/2015_8_26327_more_invisible_mount_options 
Fixes to mount state 2015.8
 2015-08-17 12:50:28 -06:00
Erik Johnson
656aec90b2 Fix wording of windows minion restart in FAQ 2015-08-17 13:39:20 -05:00
Mike Place
574b8874c4 Merge pull request #26387 from cachedout/log_level_info 
Set log_level properly
 2015-08-17 12:36:18 -06:00
Mike Place
e8345e9d87 Merge pull request #26356 from gtmanfred/postgres_queue 
create a postgres queue
 2015-08-17 12:26:07 -06:00
TheBigBear
a232bad9c2 Update win_pkg.py 2015-08-17 19:22:28 +01:00
Daniel Wallace
d26dc62c7c use the same quotes as the join 2015-08-17 11:51:48 -06:00
rallytime
b4f1fc3da7 Pylint fix 2015-08-17 11:47:10 -06:00
rallytime
9f88f11ccd Add versionadded directives for #26312 2015-08-17 11:43:13 -06:00
Nicole Thomas
a870b79748 Merge pull request #26312 from fictivekin/vpc_name_in_secgroup 
allow vpc_name instead of vpc_id for boto_secgroup
 2015-08-17 11:39:41 -06:00
Mike Place
94062b478e Set log_level properly 
This is now safe to do with the parser changes made by @s0undt3ch
 2015-08-17 11:20:29 -06:00
Daniel Wallace
a14bcef054 don't require volume endpoint in nova driver 
fixes #25955
 2015-08-17 12:00:23 -05:00
TheBigBear
6221e69c14 Fix shell quoting for cmd.run 
In my tests this fixed issue saltstack#26114 , maybe somebody needs to test for regressions? re-submitted against 2015.8 branch as requested by @twangboy
 2015-08-17 17:47:04 +01:00
rallytime
f2896c0877 Allow the creation of a VM without a profile 
Fixes #26369
 2015-08-17 10:41:05 -06:00
Joseph Hall
8b525116fc Merge pull request #26357 from codehotter/call-action-on-instance-id 
Not ready for merge! Call action on instance-id
 2015-08-17 10:33:57 -06:00
Justin Findlay
4bf5c28efa Merge pull request #26377 from jagguli/develop 
Avoid key error if 'Status' is not present in container info.
 2015-08-17 09:00:22 -06:00
Justin Findlay
3ae37cdc21 Merge pull request #26376 from TheBigBear/patch-7 
minor edit spelling
 2015-08-17 08:59:35 -06:00
Justin Findlay
d239ba6cf6 Merge pull request #26373 from TheBigBear/patch-6 
Fix shell quoting for cmd.run in win_pkg.py
 2015-08-17 08:46:56 -06:00
Justin Findlay
2201809ce7 Merge pull request #26367 from gtmanfred/develop 
use the same quotes as the join
 2015-08-17 08:43:27 -06:00
Pedro Algarvio
a73ca74bc3 White-space lint fix 2015-08-17 15:28:22 +01:00
Justin Findlay
d47c71352e Merge pull request #26353 from sixninetynine/develop 
fixed a typo in setup.py
 2015-08-17 08:28:08 -06:00
Justin Findlay
ef4dbd8b16 Merge pull request #26347 from 0xf10e/allow_pkgng_on_fbsd9 
Load 'pkgng' as 'pkg' on FreeBSD 9 when `providers:pkg` == 'pkgng'
 2015-08-17 08:26:06 -06:00
Justin Findlay
ad34921ae7 Merge pull request #26344 from hs-calc/patch-1 
Adds antix to _OS_FAMILY_MAP in grains/core.py
 2015-08-17 08:25:58 -06:00
Steven Joseph
1199218bec Avoid key error if 'Status' is not present in container info. 
- assumes container is not running if 'Status' not present
 2015-08-17 22:35:50 +10:00
TheBigBear
f9d2664def minor edit 2015-08-17 13:23:46 +01:00
Pedro Algarvio
8f69530f65 Add the unit tests for Schema in a DictItem properties 2015-08-17 13:20:18 +01:00
Pedro Algarvio
cb2aaa876c Handle Schema items 2015-08-17 13:19:04 +01:00
Pedro Algarvio
fa826c9ba2 Add a validation test for DictItem required attribute validation 2015-08-17 13:58:22 +01:00
Pedro Algarvio
f74cc21d70 DictItem must also define it's require attribute 2015-08-17 13:56:00 +01:00