valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
64,132 Commits 24 Branches 182 Tags 341 MiB
2121be88e7
Commit Graph

64132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
2121be88e7 Merge pull request #30225 from slav0nic/patch-2 
fix salt-ssh debug doc
 2016-01-12 12:45:28 -07:00
Mike Place
7908086044 Merge pull request #30228 from dmacvicar/dmacvicar_document_schedule_once 
Document schedule `once` option
 2016-01-12 12:42:57 -07:00
Mike Place
1f5c1093fc Merge pull request #30235 from sjorge/state-zfs 
salt.states.zfs
 2016-01-12 12:39:13 -07:00
Erik Johnson
5a716d09a4 Merge pull request #30259 from kiorky/patch3 
add removed/purged to supported functions
 2016-01-12 13:32:59 -06:00
Mike Place
51f99fe9f3 Merge pull request #30256 from jhujhiti/freebsd-osrelease 
Use freebsd-version to set osrelease and related grains
 2016-01-12 12:30:12 -07:00
Mike Place
109ede3d84 Merge pull request #30243 from aletourneau/develop.ssm 
Added ssm document support to ec2 salt-cloud driver
 2016-01-12 12:27:11 -07:00
Mike Place
d6fb675d9f Merge pull request #30271 from alkivi-sas/add-flexibility-for-beacon-load 
Add flexibility for beacon load
 2016-01-12 12:18:45 -07:00
Mike Place
ddb3370540 Merge pull request #30262 from msciciel/develop 
New module ethtool
 2016-01-12 12:14:42 -07:00
C. R. Oldham
8ce565fad9 Merge pull request #30294 from techhat/safeload 
YAML should always use safe_load.  Merging because failing tests are the boto ones and are not related.
 2016-01-12 10:37:54 -07:00
Joseph Hall
a4ecda25d5 YAML should always use safe_load 2016-01-12 08:54:32 -07:00
Erik Johnson
59bf118ef7 Merge pull request #30197 from robgott/states.git.detached 
add git.detached state
 2016-01-12 09:40:47 -06:00
Alkivi
b3a9274277 fix some lint errors 2016-01-12 13:45:10 +01:00
Jorge Schrauwen
fd0243f288 docs 2016-01-12 08:37:42 +00:00
Alkivi
3579ad4e48 fix some lint error 2016-01-12 08:52:59 +01:00
Rob Gott
ca0c8ef5f4 add git.detached state 2016-01-12 10:51:48 +10:00
Alkivi
d83c6cb1a0 added debug and more flexibility 2016-01-11 18:53:24 +01:00
Alkivi
9acc096ed3 added more parameters for load 2016-01-11 18:31:36 +01:00
Krzysztof Pawłowski
1920ecbbd2 Add missing new line at the end of ethtool module 2016-01-11 09:00:20 +01:00
Krzysztof Pawłowski
d056a15d0b Add versionadded and convert docstring to single quotes. 2016-01-11 08:03:52 +01:00
Mathieu Le Marec - Pasquet
7c07c185c9 add removed to supported functions 2016-01-10 22:40:34 +01:00
Mathieu Le Marec - Pasquet
0eddd18415 add purged to supported functions 2016-01-10 22:30:08 +01:00
Jorge Schrauwen
38fdba917e implemented zfs.hold_present 2016-01-10 14:06:17 +00:00
Jorge Schrauwen
d5a63bf08c implemented zfs.hold_absent 2016-01-10 13:55:31 +00:00
Jorge Schrauwen
a5b7362f58 implemented zfs.promote 2016-01-10 13:19:59 +00:00
Jorge Schrauwen
d0f3d41f89 implemented zfs.snapshot_present 2016-01-10 12:54:14 +00:00
Erick Turnquist
de5661725c Use freebsd-version to set osrelease and related grains 
Fixes #29882
 2016-01-09 17:42:45 -05:00
Jorge Schrauwen
557bf29be6 fix some oddities with bookmarks and list 2016-01-09 10:05:46 +00:00
Jorge Schrauwen
67148a73f3 implemented zfs.bookmark_present 2016-01-09 09:59:14 +00:00
Jorge Schrauwen
a23801e54e implemented zfs.volume_present 2016-01-09 09:38:04 +00:00
Jorge Schrauwen
f8d6526ba6 Implemented cloned_from param 2016-01-09 09:13:44 +00:00
Jorge Schrauwen
28a88e6de4 Implemented zfs.filesystem_present 2016-01-09 08:55:45 +00:00
Alexandre Létourneau
950db49ea8 utils.aws.query calls for any other product than ec2 do not seem to work 2016-01-08 16:01:16 -05:00
Alexandre Létourneau
cf927a7382 ec2 instances are now automatically associated with an SSM document, after being provisioned, if a ssm_document is provided 2016-01-08 16:00:48 -05:00
Colton Myers
08325395cd Merge pull request #30219 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2016-01-08 11:50:02 -07:00
Jorge Schrauwen
087e8f8475 Generate docs for salt.states.zfs 2016-01-08 17:24:44 +00:00
Jorge Schrauwen
a381b5e650 Implemented zfs.bookmark_absent 2016-01-08 17:17:01 +00:00
Jorge Schrauwen
edf342973f Implemented zfs.snapshot_absent 2016-01-08 17:07:55 +00:00
Jorge Schrauwen
50ca5b42d2 Implement zfs.volume_absent 2016-01-08 17:02:51 +00:00
Jorge Schrauwen
9574d7bfb3 Properly parse error on volume destroy in salt.modules.zfs 2016-01-08 16:56:25 +00:00
Jorge Schrauwen
123f51c874 Implement zfs.filesystem_absent 2016-01-08 16:51:01 +00:00
Colton Myers
b7051d7852 Merge pull request #29786 from jirikotlin/develop 
Zabbix modules
 2016-01-08 09:25:19 -07:00
Colton Myers
786cf61dc4 Merge pull request #30170 from thegoodduke/for_ipset 
ipset: fix comment and test
 2016-01-08 09:18:28 -07:00
Jiri Kotlin
6bbea400bd Elimination of redundant kwargs, better documentation. 2016-01-08 14:43:37 +00:00
Duncan Mac-Vicar P
e7bbcb7988 Document schedule once option 
closes #23742
 2016-01-08 11:35:44 +01:00
Sergey Maranchuk
4cce4a7c32 fix salt-ssh debug doc 
SALT_ARGV visible only in trace mode
 2016-01-08 11:33:39 +02:00
Krzysztof Pawłowski
6416d3d503 Add initial version of ethtool module 2016-01-08 09:54:14 +01:00
C. Gao
36d2ee150c ipset: fix comment and test 2016-01-08 11:26:54 +08:00
Colton Myers
17b919e9ec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/eauth/access_control.rst
    salt/modules/state.py
    salt/state.py
    salt/states/boto_secgroup.py
    tests/unit/modules/state_test.py
 2016-01-07 16:36:40 -07:00
Colton Myers
ad7522c98d Merge pull request #30189 from rallytime/bp-30185 
Back-port #30185 to 2015.8
 2016-01-07 16:32:05 -07:00
Nicole Thomas
8f30f7045a Merge pull request #30215 from jacobhammons/doc-issues 
Assorted doc bug fixes
 2016-01-07 14:53:27 -07:00