490 Commits (5327e921fea70810001b30c582f7f851849da03c)
 

Author SHA1 Message Date
  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
  Brian Jackson d3dfd1b967 Merge pull request #287 from ek9/alpine-linux-support 7 years ago
  ek9 d7af7c15bb Alpine Linux: add basic support 7 years ago
  ek9 8ae39f4700 Arch Linux: install pygit2 or libgit2 via pacman instead of source by default 7 years ago
  Matthew X. Economou c43657487f
Merge branch 'master' of github.com:saltstack-formulas/salt-formula into fix-root-group-bsd 7 years ago
  Niels Abspoel 9e42d32000 Merge pull request #282 from rocket-labs-sysadmins/beacons 7 years ago
  Matthew X. Economou 3746f08f2f
Use a different group name for GID 0 depending on the minion's O/S 7 years ago
  Tobias Martin fc40847542
fixed beacon variable name 7 years ago
  Tobias Martin 73906a03a5
added beacons configuration support 7 years ago
  Pavel Veretennikov bad783ea28 Fixes jinja in include block 7 years ago
  Niels Abspoel caff23424d fix default dict 7 years ago
  Furlot 45e686b7f2 Add http proxy support for minion 8 years ago
  Brian Jackson f58562beeb Merge pull request #276 from saltstack-formulas/fix_pygit2_debian 8 years ago
  Rene Jochum 6fab0c54c6 Merge pull request #274 from jebas/master 8 years ago
  Rene Jochum e329bda7bf Fix pygit2-libgit2 builds on Debian like platforms. 8 years ago
  Jeff Baskin 0166cd4097 Added fedora. 8 years ago
  Forrest 13f06a8ae5 Merge pull request #273 from jerrykan/saltapi 8 years ago
  John Kristensen 43663fec1b Have salt-api service watch the master config files 8 years ago
  Forrest f3f2251d75 Merge pull request #271 from dafyddj/add-master-other-settings 8 years ago
  Dafydd Jones 8e41067c69 allow non-default config settings in master.d/f_defaults.conf (similar to PR#247) 8 years ago
  Brian Jackson d68c0b63ee Merge pull request #267 from fizmat/pkgrepo-cleanup 8 years ago
  Forrest 111cbd44d1 Merge pull request #269 from mattwillsher/smartos-support 8 years ago
  Matt Willsher 157f356442 Correct SmartOS config path 8 years ago
  Forrest 88794c8c62 Merge pull request #268 from mattwillsher/smartos-support 8 years ago
  Matt Willsher 5b87c50e46 Add SmartOS salt-master and gitfs support 8 years ago
  Forrest af02bc5b78 Merge pull request #266 from fizmat/arch-update 8 years ago
  Ivan Kadochnikov 8552113226 update map.jinja after Arch renamed the package 8 years ago
  Ivan Kadochnikov fd0b200fea Delete repotype from map.jinja, unused after 8f2191471 8 years ago
  Ivan Kadochnikov e18eeffb5e Delete debian saltstack repo gpg, not used since 87f3e849d2 8 years ago
  Ivan Kadochnikov fcefad0899 Delete pkgrepo/ubuntu, not used anymore 8 years ago
  Ivan Kadochnikov 13ea551011 Simplify pkgrepo logic, made possible by 3b265a544 8 years ago
  Forrest 01043740dc Merge pull request #259 from kakwa/separate_engines_config 8 years ago
  Niels Abspoel ff8bf379a7 Merge pull request #261 from fizmat/pkgrepo-redhat 8 years ago
  Forrest f6551c5fc8 Merge pull request #265 from genuss/pillar_opts 8 years ago
  genuss 8fd8c76d5f Change default value for pillar_opts 8 years ago
  Forrest d6affbba39 Merge pull request #263 from robruma/feature/support_master_id_option 8 years ago
  Rob Ruma 6f4880a258 Adding support for master_id option documented in https://docs.saltstack.com/en/latest/ref/configuration/master.html#master-id 8 years ago
  Ivan Kadochnikov 423d58dd88 Add state that ensures pkgrepo for RedHat is absent 8 years ago
  Forrest 07aa250925 Merge pull request #260 from mothbe/master 8 years ago
  Marcin Witowski 9d0b6b03d8 fix typo for top_file_merging_strategy in salt/files/master.d/f_defaults.conf template 8 years ago
  carpenti 3098aebcad add engines as a reserved_keys to not add generic configuration 8 years ago