730 Commits (eda88bd1a684c8d462e12db31fb29cbccdf67a3d)
 

Author SHA1 Message Date
  Niels Abspoel 96edba24fe Merge pull request #322 from matthew-parlette/master 7 years ago
  Matthew Parlette 4437f7b2e1 Fixed map.jinja to work with 2017.7.0 7 years ago
  Niels Abspoel 9e7bcd5946 Merge pull request #320 from tampakrap/enable_syndic_service 7 years ago
  Theo Chatzimichos 27c69a8a93
enable the syndic service 7 years ago
  Florian Ermisch 739be9550f Merge pull request #316 from cmclaughlin/remove-env-comments 7 years ago
  a.genus 0e8573d13a Fix typo 7 years ago
  a.genus 22ad7db7c0 Add restart minion via at (fixes #136) 7 years ago
  Niels Abspoel 826bf6695e Merge pull request #318 from netmanagers/master 7 years ago
  Javier Bértoli b8273b9c3f Fix lists join error (#317) 7 years ago
  Charles McLaughlin 3a261c7da0 Update comment for consistency 7 years ago
  Charles McLaughlin 316622ef9b Remove "source" comments from Saltify configs 7 years ago
  Niels Abspoel 83433c8dd8 Merge pull request #312 from netmanagers/master 7 years ago
  Niels Abspoel be266a180c Merge pull request #314 from kakwa/ADD_SALT_REALEASE 7 years ago
  Carpentier Pierre-Francois 5c3dc73f2a fix map.jinja 7 years ago
  carpenti 6622d177bf add a way to set which release of saltstack to use 7 years ago
  Ion Dulgheru 165f2d727c Fix master_tops configuration rendering 7 years ago
  Javier Bértoli 9331997269 Exclude reactors from f_defaults.conf 7 years ago
  Javier Bértoli 3a1e7ad9f9 Fix reactor examples 7 years ago
  Javier Bértoli 561eb4c5c8 Reactors should be in an array 7 years ago
  Javier Bértoli 442806ab9e Allow to specify different reactors for minions and masters 7 years ago
  Niels Abspoel eaf9fc98f6 Merge pull request #307 from M2Mobi/external_auth 7 years ago
  Heinz Wiesinger 68a2b72519 Fix rendering of external_auth config. 7 years ago
  Nitin Madhok eb09c3bdc6 Merge pull request #305 from EvaSDK/salt-cloud-cleanups 7 years ago
  Gilles Dartiguelongue 87074cf3d9 Do not sync salt-cloud provided default configuration by default 7 years ago
  Gilles Dartiguelongue 4b29379725 Rework salt-cloud directories and files creation 7 years ago
  Gilles Dartiguelongue dce9bea40b Compact salt-cloud pip.installed instructions 7 years ago
  Niels Abspoel 85597b3326 Merge pull request #306 from netmanagers/master 7 years ago
  Javier Bértoli 7093a32968 Simplify logic 7 years ago
  Javier Bértoli 997194c992 Wrong list name in config file 7 years ago
  Nitin Madhok 64925e902c Merge pull request #304 from netmanagers/master 7 years ago
  Javier Bértoli edce95f949 Updated master and minion default config files 7 years ago
  Niels Abspoel 03ec0dce2d Merge pull request #301 from vquiering/move_to_publisher_acl 7 years ago
  Niels Abspoel ca204ea8c4 Merge pull request #302 from vquiering/fix_external_auth_config 7 years ago
  Niels Abspoel 4b5ea5a544 Merge pull request #303 from tampakrap/syndic_user 7 years ago
  Theo Chatzimichos 57498d1645
add syndic_user option in the master config 7 years ago
  Vitali Quiering f7189e2900 User publisher_acl setting in salt master config even if used client_acl in 7 years ago
  Vitali Quiering 894bd15c79 fix salt master config template to use external_auth settings 7 years ago
  Vitali Quiering d3b46a3648 add publisher_acl to salt master config 7 years ago
  puneet kandhari 31229c5a0d Merge pull request #298 from 0xf10e/no_mapping_workaround 7 years ago
  Florian Ermisch e86e6fc221 Work around missing `is mapping` on CentOS/RHEL 6 7 years ago
  Florian Ermisch 5327e921fe Hack to make rendering work on CentOS 6 7 years ago
  Niels Abspoel d34f63fdf0 Merge pull request #297 from Sjd-Risca/fix_lxc_keyword 7 years ago
  risca ef120e56bc fixed key reserved for lxc_profile file 7 years ago
  Niels Abspoel a26e82f530 Merge pull request #288 from aboe76/fix_beacons 7 years ago
  Niels Abspoel c685ca7767 Merge pull request #277 from Furlot/patch-1 7 years ago
  Niels Abspoel 2e792584d2 Merge pull request #281 from vermut/patch-1 7 years ago
  Niels Abspoel 724e603689 Merge pull request #283 from irtnog/fix-root-group-bsd 7 years ago
  Niels Abspoel 5ffed7de5c fix beacons on dev 7 years ago
  Brian Jackson cb050736b0 Merge pull request #279 from aboe76/fix_pillar_dict_with_default_merge 7 years ago
  Florian Ermisch b4d55b80f9 Merge pull request #285 from leansalt/archlinux-pygit-libgit2 7 years ago