670 Commits (978e640cf310b09ed698b156de86e699e807000d)
 

Author SHA1 Message Date
  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
  carpenti 08d10376ab implementing retro-compatible behavior 8 years ago
  carpenti c27bfd92b7 make the configuration of engines specific to master or minion 8 years ago
  Forrest 5e9c937931 Merge pull request #258 from aboe76/enable_salt_minion_standalone 8 years ago
  Niels Abspoel 64e7376fe4 fix minion daemon to be enabled if master_type is set to disable 8 years ago
  Forrest e76880d500 Merge pull request #257 from aboe76/salt-minion_standalone_with_service 8 years ago
  Niels Abspoel 1ffbb4b6bc add option to start minion service if master_type is set to disable 8 years ago
  Forrest e464109c92 Merge pull request #256 from aboe76/missing_files 8 years ago
  Niels Abspoel 13a6ecf8b9 add missing files 8 years ago
  Forrest 894351b248 Merge pull request #255 from aboe76/minion_engines_reactors 8 years ago
  Niels Abspoel ddaa166de2 add engine and reactor config to salt minion configuration 8 years ago
  Javier Bértoli 4e8d36f308 Merge pull request #253 from jerrykan/cloud_without_pip 8 years ago
  John Kristensen 37f82242e7 By default don't install cloud dependencies using pip 8 years ago
  Forrest ad440d904c Merge pull request #250 from luitzifa/master 8 years ago
  Daniel Krämer 749bf0e863 [BIGFUX] make pygit2 work with ubuntu xenial 8 years ago
  Forrest 52bc1badca Merge pull request #251 from UGNS/master 8 years ago
  Jeremy T. Bouse 4283cba123 Add example for winrepo_provider 8 years ago
  Daniel Krämer a842dbe621 Fixes saltstack-formulas/salt-formula#190 8 years ago
  Jeremy T. Bouse 79fcda8806 Clean up formating of nodegroups 8 years ago
  Jeremy T. Bouse a89d8d9b6b Add winrepo_provider to master.d/f_defaults.conf 8 years ago
  Forrest 2a80f55a17 Merge pull request #249 from msciciel/salt-master-yaml-utf8 8 years ago