Commit Graph

71930 Commits

Author SHA1 Message Date
Oliver Tupman
3b79c7c36d Quick refactor to remove duplication and add a test for config validation failure 2016-08-01 17:06:57 +01:00
Oliver Tupman
162c3a4503 Fix for clonefrom/image settings 2016-08-01 17:06:57 +01:00
Oliver Tupman
e37a8e98bd Adds simple, if verbose test to validate the image/clonefrom settings 2016-08-01 17:06:57 +01:00
Mike Place
9bf9edb0e0 Merge pull request #35071 from terminalmage/issue35065
Detect nodegroup lists with no compound syntax as L@host1,host2,host3...
2016-08-01 06:52:40 -06:00
Mike Place
ef2c89f0d8 Merge pull request #35073 from MTecknology/develop
Adding zfsroot option to lxc-create.
2016-08-01 06:44:26 -06:00
Mike Place
7f9a2c6e68 Merge pull request #35075 from dschaller/fix-broken-npm-json-formatting
Fix broken npm json formatting
2016-08-01 06:42:06 -06:00
Mike Place
802bc28d3f Merge pull request #35082 from AlexNPavel/develop
Add encryption support to etcd
2016-08-01 06:38:05 -06:00
Mike Place
e14407b8ee Merge pull request #35076 from dmacvicar/add_suse_links_1
add links to (open)SUSE family of images and build generation tools
2016-08-01 06:28:18 -06:00
Mike Place
8b88e09467 Merge pull request #35077 from jf/tighten-test_list_modules_with_arg
Tighten up test_list_modules_with_arg: should include "assertNotIn" too
2016-08-01 06:27:46 -06:00
Mike Place
38bee69fc8 Merge pull request #35089 from calve/develop
Output changes to be applied on security group when test=True
2016-08-01 05:53:34 -06:00
calve
90868f45bd Output changes to be applied on security group when test=True 2016-08-01 11:22:55 +02:00
Duncan Mac-Vicar P
9bfb3d85f1 add links to (open)SUSE family of images and build generation tools 2016-07-31 10:37:18 +02:00
AlexNPavel
d107109e11 Remove unnecessary semicolon 2016-07-30 17:55:01 -04:00
AlexNPavel
be20c89768 Add encryption support to etcd
Fixes #35009.
2016-07-30 17:16:25 -04:00
Jeffrey 'jf' Lim
17a230a2e5 Tighten up test_list_modules_with_arg: should include "assertNotIn" too 2016-07-31 02:16:45 +08:00
Derek Schaller
daebb5854f fix unindexed string formatting in npm module 2016-07-29 23:17:40 -07:00
Derek Schaller
f0837b8243 general cleanup for npm states 2016-07-29 22:18:51 -07:00
Derek Schaller
07a7a14892 add silent flag to npm list 2016-07-29 22:14:16 -07:00
Derek Schaller
99e6458a20 fix invalid json formatter and general clean up 2016-07-29 22:14:16 -07:00
Erik Johnson
723b536eae Add documentation, release notes mention for new feature 2016-07-29 19:28:52 -05:00
Erik Johnson
bd4d1d31a0 Add nodegroup_comp unit tests 2016-07-29 19:28:52 -05:00
Erik Johnson
0c68da0601 Detect nodegroup lists with no compound syntax as L@host1,host2,host3...
Resolves #35065.
2016-07-29 19:28:52 -05:00
Michael Lustfield
83de13edcb Adding zfsroot option to lxc-create.
Patch developed by Suitable Technologies.
2016-07-29 16:23:41 -07:00
Mike Place
ec821510bf Merge pull request #34909 from twangboy/int_tests_beacons
Add check for admin on Windows, gated
2016-07-29 10:39:28 -06:00
Mike Place
b0b2eabda9 Merge pull request #35012 from lubyou/let-win_dacl-accept-sids
Accept both user accounts and SID's in the win_dacl module.
2016-07-29 10:33:38 -06:00
Mike Place
316ac62463 Merge pull request #35031 from bodhi-space/infra1589
INFRA-1589 - add several tagging related functions to boto_ec2 exec and state modules
2016-07-29 10:07:06 -06:00
Mike Place
bd5e2a3ed3 Merge pull request #35033 from UtahDave/fix_win_cpu_model
Fix cpu_model grain on Windows to actual CPU model
2016-07-29 10:06:25 -06:00
Mike Place
b057a57017 Merge pull request #35036 from techhat/fallback
Catch errors when attempting fallback
2016-07-29 09:13:21 -06:00
Mike Place
9f91c0d954 Merge pull request #35047 from bodhi-space/elasticache-bits
Add a couple of functions to boto_elasticache, and fix a bug I introduced awhile back
2016-07-29 08:53:03 -06:00
Johannes Scholz
d1873075e0 make lint happy 2016-07-29 10:37:37 +02:00
Mike Place
4fe3397a41 Merge pull request #34921 from tonybaloney/quickstart
Introduce a template system for extending SaltStack open
2016-07-28 22:38:10 -06:00
Anthony Shaw
e32ba10365
add 2.6 support 2016-07-29 10:00:28 +10:00
Tom Williams
3d9d137e98 Add boto_elasticache.{get_all,list}_cache_subnet_groups() and fix a bug I introduced 2016-07-28 19:40:34 -04:00
Anthony Shaw
39159cc6cb
add the salt deserializer 2016-07-29 09:29:17 +10:00
Tom Williams
f348963412 INFRA-1589 - oops, forgot and used dictionary comprehensions :) 2016-07-28 19:18:14 -04:00
David Boucha
2fe747c05c add release note about the cpu_model grain change 2016-07-28 15:35:55 -06:00
David Boucha
7258847f92 Fix cpu_model grain on Windows to actual CPU model 2016-07-28 15:35:55 -06:00
Mike Place
9a66dae07f Merge pull request #34845 from vladislav-jomedia/add-tmp_ext-to-file_managed
added extention for tmp file when using check_cmd in file.managed state
2016-07-28 14:32:12 -06:00
Mike Place
3784464077 Merge pull request #34814 from vutny/smtp-return-multiple-recipients
smtp_return: allow specifying multiple recipients
2016-07-28 14:30:42 -06:00
Joseph Hall
9d216529ba Change warn log to info 2016-07-28 14:10:56 -06:00
Mike Place
404833e51b Merge pull request #34969 from fdamstra/Add_multi_event_return
Adds support for multiple server-side event_returners.
2016-07-28 13:39:52 -06:00
Mike Place
0fea848878 Merge pull request #35022 from rallytime/cleanup-34914
Add versionadded for new cache_valid_time option in aptpkg
2016-07-28 13:39:02 -06:00
Mike Place
66127f277b Merge pull request #35005 from twangboy/int_tests_state
Fix state execution module integration tests for Windows
2016-07-28 13:37:54 -06:00
Mike Place
9adfa4a651 Merge pull request #34972 from twangboy/int_tests_hosts
Fix hosts integration tests for Windows
2016-07-28 13:36:11 -06:00
Joseph Hall
3df8183af6 Catch errors when attempting fallback 2016-07-28 13:03:31 -06:00
Mike Place
09d8a37110 Merge pull request #35030 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-07-28 12:38:30 -06:00
Mike Place
22a9237e1e Merge pull request #35025 from dmacvicar/apt_crash
do not crash on "make" package description.
2016-07-28 11:55:41 -06:00
Tom Williams
920a60d494 INFRA-1589 - add several tagging related functions to boto_ec2 exec and state modules 2016-07-28 13:50:36 -04:00
rallytime
fde7e0f4c5 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/utils/schedule.py
2016-07-28 11:08:14 -06:00
twangboy
1607da0841 Better fix 2016-07-28 09:48:09 -07:00