Commit-Graf

0383f20 (HEAD -> master) Merge pull request #379 from aanriot/master by Niels Abspoel 2018-07-11 20:35:12 +0200
3e6e602 Support publisher_acl minion-level commands by Alexandre Anriot 2018-07-11 14:36:41 +0200
d87d858 Merge pull request #378 from mrichar1/extra_config by Niels Abspoel 2018-07-02 11:12:05 +0200
aff75ce Handle other non-iterable values like int/float. by Matthew Richardson 2018-07-01 22:09:34 +0100
a1a65ce Merge pull request #375 from mrichar1/extra_config by Niels Abspoel 2018-06-29 17:06:50 +0200
1a5027e Handle pillar params with child params. (#372) by Matthew Richardson 2018-06-22 09:41:10 +0100
c363aa9 Handle extra config where value is a list. by Matthew Richardson 2018-06-12 14:39:23 +0100
784e2bc Update `pillar.example` for single-dir, multi-branch `salt_formulas` #239 (#373) by myii 2018-06-11 19:38:58 +0100
2761d90 minion: master_alive_interval: remove duplicate (#369) by ze42 2018-06-11 11:12:23 +0200
91b666c Improve limitations related to `git.latest` in `salt.formulas` (#239) by myii 2018-06-10 10:18:20 +0100
d2ceaab only set master_alive_interval once (#368) by Justin Riley 2018-06-08 11:12:07 -0400
9f33d2a [Minion] [returner] [Elasticsearch] Yaml read patch + example.pillar update (#359) by Felix Russell 2018-04-17 13:26:45 -0700
32d9a94 Add MacOS support; fix Issue #352 (#363) by Colin Stubbs 2018-04-18 06:26:20 +1000
d1e4768 Quotation and ipv6 (#355) by Jerzy Drozdz 2018-04-05 12:45:59 +0200
dd731c6 Merge pull request #362 from colin-stubbs/issue-361 by Niels Abspoel 2018-04-05 12:42:22 +0200
d40d869 Add os_family default for gitpython on RedHat by Colin Stubbs 2018-04-01 21:52:29 +1000
275067a Fix for issue #361 by Colin Stubbs 2018-04-01 21:50:19 +1000
9a81ab2 Merge pull request #360 from aboe76/python3_iter by Javier Bértoli 2018-03-06 18:33:44 -0300
3c73160 fix iteritems python3 by Niels Abspoel 2018-03-06 20:52:04 +0100
fd96c7a Merge pull request #357 from Zero-Down-Time/master by Niels Abspoel 2018-02-02 16:49:29 +0100
fc20249 Merge pull request #358 from iustinam/pkgver by Javier Bértoli 2018-02-01 13:50:01 -0300
6027df0 Add configuration for packages version by Iustina 2018-02-01 12:13:55 +0200
e92f6f8 Fix default value to match array type of pillar by Stefan Reimer 2018-01-30 12:57:31 -0800
334d5de Support profiles within engine.conf to be able to configure sqs_events, https://docs.saltstack.com/en/latest/ref/engines/all/salt.engines.sqs_events.html by Stefan Reimer 2018-01-29 12:28:48 -0800
b15ce1c Merge pull request #351 from colin-stubbs/master by Niels Abspoel 2018-01-06 15:27:37 +0100
32f3104 Missing single quote by Colin Stubbs 2018-01-06 23:22:57 +1000
4307b8e Add pkg source default options for MacOS by Colin Stubbs 2018-01-06 23:21:15 +1000
532b306 Add initial basis for proper MacOS support by Colin Stubbs 2018-01-06 22:54:57 +1000
996aa78 pillar example is incorrect; map.jinja incorrectly names package for windows by Colin Stubbs 2018-01-06 22:21:02 +1000
8268d83 Merge pull request #348 from sjorge/patch-1 by Niels Abspoel 2017-12-24 09:35:53 +0100
71e08ab Set correct api_service for SmartOS by Jorge Schrauwen 2017-12-23 22:23:53 +0100
31e2d95 Merge pull request #339 from dafyddj/win-restart by Niels Abspoel 2017-12-23 11:41:06 +0100
d01083f Merge pull request #345 from Angelo-Verona/master by Niels Abspoel 2017-12-23 11:39:30 +0100
c8e86c5 Changed formating in pillar example to avoid warning about wrong dictionary format from Salt. Added comment about type of token. by Angelo Verona 2017-12-08 02:18:10 +0100
24998a4 Merge pull request #332 from mchugh19/indenting by Niels Abspoel 2017-11-21 11:33:06 +0100
fa657a8 add also default git values for SUSE osfamily (#344) by Theo Chatzimichos 2017-11-21 00:18:22 +0100
3fd9b09 add default values for SUSE osfamily (#343) by Theo Chatzimichos 2017-11-20 23:34:09 +0100
d987901 fix windows minion restart command by Dafydd Jones 2017-10-16 17:09:19 +0100
01564c3 Change cmd.wait to cmd.run (#336) by Alexandre Gomes 2017-10-01 15:22:11 -0300
9ef5335 Update f_defaults.conf to support elasticsearch returner (#335) by Andrew Ernst 2017-09-29 13:13:00 -0700
b615ca0 Merge pull request #333 from EvaSDK/gentoo-pyinotify by Niels Abspoel 2017-09-11 15:34:09 +0200
3c88ad9 Add pyinotify entry for Gentoo, refs #331 by Gilles Dartiguelongue 2017-09-11 14:32:47 +0200
413a2ea Merge pull request #331 from chessclub/fix-inotify-beacon-dependency by Niels Abspoel 2017-08-29 00:12:13 +0200
228f74b Merge pull request #330 from aboe76/fix_deprecated_iteritems by Niels Abspoel 2017-08-29 00:11:12 +0200
d5c10f5 fix indenting around peer run. Convert extra configs from json to yaml by Christian McHugh 2017-08-28 07:04:43 +0100
80a160a Added default pyinotify package name for archlinux. by Tibold 2017-08-16 07:20:00 +0000
e94f15d Added support for installing pynotify when inotify beacons are configuredwq by Tibold 2017-08-15 20:48:15 +0000
e2973c6 fix iteritems() with items() by Niels Abspoel 2017-08-14 13:15:30 +0200
d6389b8 Merge pull request #313 from iondulgheru/master by Niels Abspoel 2017-08-13 22:38:48 +0200
8ad2bb6 Merge pull request #325 from mechleg/minion-restart by Niels Abspoel 2017-08-08 22:23:23 +0200
3d8f2f6 Merge pull request #328 from saltstack-formulas/fix-pillar-example by Niels Abspoel 2017-08-07 20:15:12 +0200
7e8df76 Corrected salt:release in pillar.example by Alexander Weidinger 2017-08-07 17:49:44 +0200
e307b0c Merge pull request #327 from arthurlogilab/patch-2 by Niels Abspoel 2017-08-04 14:04:15 +0200
0467074 [pillar.example] fix indentation of reactors examples by Arthur Lutz 2017-08-04 11:44:06 +0200
e8ef3c1 adding salt-minion restart option from official FAQ page by mechleg 2017-07-27 13:15:21 -0700
9cf5cd2 Merge pull request #319 from genuss/restart_via_at by Niels Abspoel 2017-07-26 21:45:25 +0200
c265206 Merge pull request #323 from aquto/master by Niels Abspoel 2017-07-25 16:37:25 +0200
ec8241c Added minion scheduler configuration by Elliot Chen 2017-07-19 14:58:10 -0400
96edba2 Merge pull request #322 from matthew-parlette/master by Niels Abspoel 2017-07-21 16:47:03 +0200
4437f7b Fixed map.jinja to work with 2017.7.0 by Matthew Parlette 2017-07-18 16:18:44 -0400
9e7bcd5 Merge pull request #320 from tampakrap/enable_syndic_service by Niels Abspoel 2017-06-29 13:14:36 +0200
27c69a8 enable the syndic service by Theo Chatzimichos 2017-06-29 13:05:15 +0200
739be95 Merge pull request #316 from cmclaughlin/remove-env-comments by Florian Ermisch 2017-06-16 12:17:20 +0200
0e8573d Fix typo by a.genus 2017-06-15 13:30:30 +0300
22ad7db Add restart minion via at (fixes #136) by a.genus 2017-06-14 18:35:00 +0300
826bf66 Merge pull request #318 from netmanagers/master by Niels Abspoel 2017-06-09 22:42:51 +0200
b8273b9 Fix lists join error (#317) by Javier Bértoli 2017-06-09 08:34:55 -0300
3a261c7 Update comment for consistency by Charles McLaughlin 2017-06-07 14:55:25 -0700
316622e Remove "source" comments from Saltify configs by Charles McLaughlin 2017-06-07 13:38:21 -0700
83433c8 Merge pull request #312 from netmanagers/master by Niels Abspoel 2017-06-03 19:28:05 +0200
be266a1 Merge pull request #314 from kakwa/ADD_SALT_REALEASE by Niels Abspoel 2017-05-31 23:15:30 +0200
5c3dc73 fix map.jinja by Carpentier Pierre-Francois 2017-05-31 22:53:48 +0200
6622d17 add a way to set which release of saltstack to use by carpenti 2017-05-30 09:18:54 +0200
165f2d7 Fix master_tops configuration rendering by Ion Dulgheru 2017-05-24 18:17:05 +0300
9331997 Exclude reactors from f_defaults.conf by Javier Bértoli 2017-05-22 20:56:13 -0300
3a1e7ad Fix reactor examples by Javier Bértoli 2017-05-22 20:52:48 -0300
561eb4c Reactors should be in an array by Javier Bértoli 2017-05-22 19:34:31 -0300
442806a Allow to specify different reactors for minions and masters by Javier Bértoli 2017-05-22 19:20:36 -0300
eaf9fc9 Merge pull request #307 from M2Mobi/external_auth by Niels Abspoel 2017-05-10 21:24:19 +0200
68a2b72 Fix rendering of external_auth config. by Heinz Wiesinger 2017-05-09 12:50:04 +0200
eb09c3b Merge pull request #305 from EvaSDK/salt-cloud-cleanups by Nitin Madhok 2017-04-23 12:47:31 -0400
87074cf Do not sync salt-cloud provided default configuration by default by Gilles Dartiguelongue 2017-04-11 13:30:23 +0200
4b29379 Rework salt-cloud directories and files creation by Gilles Dartiguelongue 2017-04-10 11:20:43 +0200
dce9bea Compact salt-cloud pip.installed instructions by Gilles Dartiguelongue 2017-04-10 09:54:56 +0200
85597b3 Merge pull request #306 from netmanagers/master by Niels Abspoel 2017-04-10 19:35:19 +0200
7093a32 Simplify logic by Javier Bértoli 2017-04-10 12:14:12 -0300
997194c Wrong list name in config file by Javier Bértoli 2017-04-10 12:11:09 -0300
64925e9 Merge pull request #304 from netmanagers/master by Nitin Madhok 2017-04-10 10:04:38 -0400
edce95f Updated master and minion default config files by Javier Bértoli 2017-04-09 12:28:50 -0300
03ec0dc Merge pull request #301 from vquiering/move_to_publisher_acl by Niels Abspoel 2017-04-08 12:05:15 +0200
ca204ea Merge pull request #302 from vquiering/fix_external_auth_config by Niels Abspoel 2017-04-08 12:04:57 +0200
4b5ea5a Merge pull request #303 from tampakrap/syndic_user by Niels Abspoel 2017-04-07 13:14:58 +0200
57498d1 add syndic_user option in the master config by Theo Chatzimichos 2017-04-07 12:12:21 +0200
f7189e2 User publisher_acl setting in salt master config even if used client_acl in pillar (backwards compatibility) by Vitali Quiering 2017-03-27 08:39:05 +0200
894bd15 fix salt master config template to use external_auth settings by Vitali Quiering 2017-03-25 19:59:16 +0100
d3b46a3 add publisher_acl to salt master config by Vitali Quiering 2017-03-24 13:07:19 +0100
31229c5 Merge pull request #298 from 0xf10e/no_mapping_workaround by puneet kandhari 2017-03-04 05:17:38 -0600
e86e6fc Work around missing `is mapping` on CentOS/RHEL 6 by Florian Ermisch 2017-02-24 18:10:54 +0100
5327e92 Hack to make rendering work on CentOS 6 by Florian Ermisch 2017-02-24 13:34:31 +0100
d34f63f Merge pull request #297 from Sjd-Risca/fix_lxc_keyword by Niels Abspoel 2017-02-24 00:03:04 +0100