valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
87,146 Commits 24 Branches 182 Tags 341 MiB
0ed4f5533d
Commit Graph

87146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
b89d681327 Merge pull request #44017 from dis-xcom/develop 
Fix issue with mutable 'virt:disk' object
 2017-10-12 11:48:07 -04:00
Nicole Thomas
5166b1f5b8 Merge pull request #44002 from rawkode/feature/add-requests-warning 
Adding requirement for requests 2.4.2 when using Vault module
 2017-10-12 11:42:46 -04:00
Nicole Thomas
e38f313ac0 Merge pull request #44051 from twangboy/win_fix_docs_dacl 
Fix some documentation formatting issues in the win_dacl state
 2017-10-12 11:40:16 -04:00
Nicole Thomas
18dfc1967d Merge pull request #43849 from kkoch986/develop 
Add support for tagging newly created DigitalOcean droplets.
 2017-10-12 11:35:29 -04:00
Nicole Thomas
2fedcec6bb Merge branch '2017.7' into jid_queue 2017-10-12 11:29:56 -04:00
Nicole Thomas
a85837d72b Merge pull request #44066 from Ch3LL/cherry_release 
Add Known CherryPy Issue to 2017.7.2 Release Notes
 2017-10-12 11:18:24 -04:00
Erik Johnson
1e2e2b6ac5
Move 5 functions from salt.utils 
These functions are:

- salt.utils.ip_bracket -> salt.utils.zeromq.ip_bracket
- salt.utils.gen_mac -> salt.utils.network.gen_mac
- salt.utils.mac_str_to_bytes -> salt.utils.network.mac_str_to_bytes
- salt.utils.refresh_dns -> salt.utils.network.refresh_dns
- salt.utils.dns_check -> salt.utils.network.dns_check
 2017-10-12 09:07:00 -05:00
Nicole Thomas
4dbbc38a12 Merge pull request #43989 from terminalmage/salt.utils.process 
Move 4 functions from salt.utils
 2017-10-12 09:48:54 -04:00
Ch3LL
8e597fcce9
Add Known CherryPy Issue to 2017.7.2 Release Notes 2017-10-12 09:33:59 -04:00
Charlie Root
bc17787c9d
modules elbv2 fix 2017-10-12 14:30:33 +02:00
Markus Wyrsch
911ee5f361
Add option to eagerly scrub the disk 2017-10-12 13:43:27 +02:00
Ronald van Zantvoort
e555b6351b doc fixes for salt-ssh roster(s) opts 2017-10-12 11:42:23 +02:00
Nasenbaer
255aa94c64 Activate jid_queue also for SingleMinions to workaround 0mq reconnection issues 2017-10-12 10:02:54 +02:00
Nasenbaer
9efd63526a Adapted documentation of delete_on_termination parameter 2017-10-12 09:54:42 +02:00
Nasenbaer
eb2bfd047b Add missing delete_on_termination passthrough. Adapt docs. 2017-10-12 09:54:42 +02:00
Ken Koch
ecda3277d3 Merge branch 'develop' of github.com:kkoch986/salt into develop 2017-10-11 21:14:36 -04:00
Ken Koch
067d4a5dd2 change tags to list based in config 2017-10-11 21:14:27 -04:00
Dennis Dmitriev
a7108ff003
Fix issue with mutable 'virt:disk' object 
Images stored in 'virt:disk:<profile>:image' , if exist, have
higher priority than 'image' argument for 'virt' module.

But if different nodes will use different images for the same disk
<profile> during the run, then the image used for the first node
will be re-used for all the rest because it is stored in the
mutable object.

Use copy.deepcopy to avoid such issue.
 2017-10-12 02:30:41 +03:00
Mike Place
fcab77ac7b Merge pull request #43889 from CorvinM/issue43449 
Fix issue with using roster_defaults with flat or cloud rosters.
 2017-10-11 17:22:10 -06:00
Mike Place
24b9f21456 Merge pull request #43831 from eradman/vmm_grain 
Detect OpenBSD guest running under VMM(4)
 2017-10-11 17:19:52 -06:00
Mike Place
3bc4dcec05 Merge pull request #43897 from ablinkinz/centurylinkcloud_provider 
Adding Century Link Cloud Provider
 2017-10-11 16:45:24 -06:00
Mike Place
4c2c1bee51 Merge pull request #43924 from kunal-bajpai/fix_id_cache 
Create minion_id dirs if not exists
 2017-10-11 16:43:25 -06:00
twangboy
377d6b6171
Fix some docs in the win_dacl state module 2017-10-11 16:28:26 -06:00
Mike Place
3ad1c6d1d9 Merge pull request #44031 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-10-11 16:03:30 -06:00
Mike Place
5db1e8c6ca Merge pull request #44045 from isbm/isbm-tgttype-fix-2017-port 
Bugfix: always return a string "list" on unknown job target type.
 2017-10-11 15:58:11 -06:00
Erik Johnson
554c685ce5
Move 4 functions from salt.utils 
- salt.utils.reinit_crypto -> salt.utils.crypt.reinit_crypto
- salt.utils.appendproctitle -> salt.utils.process.appendproctitle
- salt.utils.daemonize -> salt.utils.process.daemonize
- salt.utils.daemonize_if -> salt.utils.process.daemonize_if
 2017-10-11 14:49:50 -05:00
Nicole Thomas
2f64837de3 Merge pull request #44049 from terminalmage/fix-warning 
Fix bad copypasta in warning message
 2017-10-11 15:16:02 -04:00
Erik Johnson
d3d76c79ca
Fix bad copypasta in warning message 2017-10-11 14:12:51 -05:00
Nicole Thomas
1e4dec5402 Merge pull request #43053 from DSRCorporation/bugs/43003_group_syndic_develop 
Group minion events in Syndic.
 2017-10-11 13:35:37 -04:00
Nicole Thomas
88c00ea198 Merge branch 'develop' into bugs/43003_group_syndic_develop 2017-10-11 13:35:16 -04:00
Nicole Thomas
bbdabe242a Merge pull request #44025 from dayid/lover_typo 
Typo correction of lover to lower
 2017-10-11 13:31:44 -04:00
Daniel Wallace
41c086faf7
convert jinja context to dictionary 
For `show_full_context`, it is useful to have this as a serializable dictionary so that it can be dumped and actually parsed using

`{{show_full_context|yaml(False)}}`
 2017-10-11 10:24:34 -06:00
Bo Maryniuk
471ff35c2f Bugfix: always return a string "list" on unknown job target type. 2017-10-11 17:45:00 +02:00
Nicole Thomas
3a078304d8 Merge pull request #43982 from terminalmage/salt.utils.data 
Move 13 functions from salt.utils to salt.utils.data
 2017-10-11 11:42:08 -04:00
garethgreenaway
6c8f7fd5ec Merge pull request #44026 from rallytime/bp-43950 
Back-port #43950 to 2017.7
 2017-10-11 08:27:48 -07:00
garethgreenaway
aae062deeb Merge pull request #44022 from garethgreenaway/mount_state_module_fix 
[develop] Fix to mount state module
 2017-10-11 08:27:06 -07:00
Nicole Thomas
5d719a2219 Merge pull request #44027 from rallytime/bp-44012 
Back-port #44012 to 2017.7.2
 2017-10-11 09:28:24 -04:00
rallytime
1d4a6c3949
Lint: Fixup undefined variable errors 2017-10-11 09:25:41 -04:00
Nicole Thomas
d8f3891a5e Merge pull request #44030 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-10-11 09:01:41 -04:00
Vernon Cole
e9c7c69402
documentation for vagrant cloud & state 2017-10-11 05:02:26 -06:00
Vernon Cole
4cdb04b409
documentation for vagrant cloud & state 2017-10-11 04:49:47 -06:00
Vernon Cole
41298e9c57
vagrant cloud driver 2017-10-11 04:48:09 -06:00
Vernon Cole
5b1069809c
vagrant states 2017-10-11 04:47:16 -06:00
Vernon Cole
02986140b8
utility support for vagrant-cloud 2017-10-11 04:41:20 -06:00
garethgreenaway
e30c797d9b Merge pull request #43600 from vernondcole/vagrant-module 
Vagrant module
 2017-10-10 21:20:14 -07:00
garethgreenaway
f3699ade0a Merge branch 'develop' into vagrant-module 2017-10-10 17:07:20 -07:00
Erik Johnson
ab8c224e07
Remove docstrings in salt.utils convenience functions 
Having the duplicate docstrings makes CodeClimate cry.
 2017-10-10 17:42:42 -05:00
Erik Johnson
d947ddf176
Move 13 functions from salt.utils to salt.utils.data 
These functions are:

- salt.utils.compare_dicts
- salt.utils.compare_lists
- salt.utils.decode_dict
- salt.utils.decode_list
- salt.utils.exactly_n
- salt.utils.exactly_one
- salt.utils.traverse_dict
- salt.utils.filter_by
- salt.utils.traverse_dict_and_list
- salt.utils.subdict_match
- salt.utils.substr_in_list
- salt.utils.is_dictlist
- salt.utils.repack_dictlist
 2017-10-10 17:42:42 -05:00
Matthew Summers
18fb0be96a
addresses issue #43307, disk.format_ to disk.format 
This change fixes breakage. It appears the disk.format_ func is
aliased to disk.format in modules/disk.py
 2017-10-10 16:11:54 -05:00
rallytime
788ad0609a
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-10-10 16:34:52 -04:00