Commit Graph

64210 Commits

Author SHA1 Message Date
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
Tom Kunicki
03d6cfd195 add spot_prefix to UserData param
fix #30286
2016-01-12 13:15:07 -06:00
Mike Place
ddb3370540 Merge pull request #30262 from msciciel/develop
New module ethtool
2016-01-12 12:14:42 -07:00
Kris Raney
0d211a4fd5 Basic CloudTrail module 2016-01-12 13:13:19 -06:00
twangboy
274e66f624 Made changes for better unicode handling 2016-01-12 10:56:19 -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
twangboy
b5a9f06669 Refactored and added missing CLI examples 2016-01-12 09:42:18 -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
twangboy
b10c9a37d2 Fixed more lint 2016-01-12 06:43:20 -07: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
twangboy
d5a9943e27 Fixed some lint, unused imports 2016-01-11 18:31:48 -07:00
twangboy
67e44b162a Put colon in the wrong place 2016-01-11 18:30:11 -07:00
twangboy
a234d6c12c Fixed missing colons in if statements 2016-01-11 18:28:24 -07:00
Rob Gott
ca0c8ef5f4 add git.detached state 2016-01-12 10:51:48 +10:00
twangboy
06b1aba45b Added documentation to new functions 2016-01-11 17:38:57 -07:00
Sergey Maranchuk
8bf7cf65ad re #26070: fix custom grains in salt-ssh 2016-01-11 23:53:51 +02:00
abednarik
128ded881f Add test in npm state.
Updated nmp module to append --dry-run when executing nmp state in test mode.

Fixes #30250.
2016-01-11 17:05:12 -03: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
Alkivi
ed8468eb98 Add parameter emitatstartup to avoid unecessary broadcast 2016-01-11 18:13:20 +01:00
Mathieu Le Marec - Pasquet
0a0e69a5c4 fix quoting 2016-01-11 11:04:47 +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
Pedro Algarvio
9d888e9a6d When daemonizing allow stopping multiprocessing.
Allow stopping the multiprocessing logging queue listener from the main
process while daemonizing.

Fixes #30247
2016-01-09 12:50:44 +00: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
twangboy
7a8a291269 Removed erroneuous function from win_useradd.py 2016-01-08 13:11:10 -07:00
twangboy
58af2838e0 Fixed more unicode issues 2016-01-08 13:08:18 -07:00
twangboy
0d92ba3390 dealing with values that aren't set yet 2016-01-08 13:03:49 -07:00
twangboy
869d4d71e7 Added unicode support to mac_user.py 2016-01-08 13:00:01 -07:00
twangboy
5622612bb3 Fixed problem with timestamp conversion 2016-01-08 12:23:38 -07:00
twangboy
75153a7f38 Converted unix times to regular times 2016-01-08 12:16:59 -07:00
twangboy
845783d712 various bug fixes 2016-01-08 12:03:00 -07:00