844 Commits (aecf1743fe0f7b754abeefc766317ba398c412d0)
 

Author SHA1 Message Date
  Nitin Madhok 1b13259823 Merge pull request #97 from aboe76/multi_master 10 years ago
  Niels Abspoel 23fd8b64af Fix #39 multi master support to minion 10 years ago
  Nitin Madhok 22fe873c5b Merge pull request #96 from aboe76/rest_tornado 10 years ago
  Niels Abspoel 7ddc1692ec added rest_tornado to _defaults.conf 10 years ago
  Nitin Madhok f39fff2329 Merge pull request #90 from aboe76/master 10 years ago
  Niels Abspoel de71de216e Merge pull request #94 from jcftang/master 10 years ago
  Jimmy Tang 2e30a44e41 saltify provider should set correct master 10 years ago
  Nitin Madhok f2131b05f3 Merge pull request #92 from saltstack-formulas/revert-91-master 10 years ago
  Nitin Madhok fa6c39eccd Revert "Add mine_functions to master config template" 10 years ago
  Nitin Madhok 5cec66107a Merge pull request #91 from qbcode/master 10 years ago
  Jimmy Tang deee69319f Add mine_functions to master config template 10 years ago
  Niels Abspoel d071713fa7 update pillar.example for new lookup 10 years ago
  Niels Abspoel 7b4104cf6e updated archlinux map.jinja, to install salt-zmq 10 years ago
  Wolodja Wentland d3b920f5c7 Merge pull request #87 from aboe76/master 10 years ago
  Niels Abspoel ea4623b0a3 fix salt-ssh on Arch and Opensuse 10 years ago
  Nitin Madhok 07b4fbd86a Merge pull request #86 from smlloyd/master 10 years ago
  Simon Lloyd cb03e885d4 Fix: pkgs is undefined 10 years ago
  Nitin Madhok 9821a94104 Merge pull request #85 from aboe76/master 10 years ago
  Niels Abspoel acf5832f68 fix #84 with same logic as dnsmasq-formula 10 years ago
  Seth House 77522d6e56 Merge pull request #81 from aboe76/use_lookup_map.jinja 10 years ago
  Niels Abspoel 4dc0044772 update use_lookup_map with merges from upstream 10 years ago
  Niels Abspoel daf04c2688 Merge branch 'master' into use_lookup_map.jinja 10 years ago
  Nitin Madhok 96b409fa90 Merge pull request #82 from juiceinc/master 10 years ago
  Tim O'Guin b19c3acc77 merged with upstream 10 years ago
  Niels Abspoel 896578a75a Removed package_map lookup 10 years ago
  Nitin Madhok e8e01e34d9 Merge pull request #80 from aboe76/update_config_2014.7 10 years ago
  Niels Abspoel 5bed5368e2 updated minion _defaults.conf to version 2014.7 10 years ago
  Forrest 77c0ecd729 Merge pull request #78 from qbcode/master 10 years ago
  Forrest c0af23f439 Merge pull request #79 from rhertzog/misc-bugfixes 10 years ago
  Raphaël Hertzog 7fb86b9076 Fix the handling of event_return_whitelist/event_return_blacklist 10 years ago
  Raphaël Hertzog d4ae38f825 Import the salt/formulas.jinja template with context 10 years ago
  Raphaël Hertzog 445108f87a Avoid “set salt” jinja calls that mask the usual salt variable 10 years ago
  Jimmy Tang b687659bff Initial add of dummy saltify settings 10 years ago
  Wolodja Wentland 98917adad2 Merge pull request #77 from rhertzog/misc-bugfixes 10 years ago
  Nitin Madhok 4bd82e79e9 Merge pull request #76 from rhertzog/formulas 10 years ago
  Raphaël Hertzog 8a828b506e Use items() method instead of iteritems() for Python 3 compatibility 10 years ago
  Raphaël Hertzog 2f2cd972ac Use items() method to loop over nodegroups/log_granular_levels dictionaries 10 years ago
  Raphaël Hertzog f46b4f29d8 Add new “salt.formulas” state to manage salt formulas 10 years ago
  Seth House 02f8debea8 Merge pull request #72 from aboe76/update_config_2014.7 10 years ago
  Nitin Madhok 838386e0f1 Merge pull request #74 from rhertzog/standalone 10 years ago
  Nitin Madhok d7c332724d Merge pull request #75 from rhertzog/pkgrepo 10 years ago
  Raphaël Hertzog 41f85695b3 Fix link and title in salt.standalone section of README.rst 10 years ago
  Raphaël Hertzog 339adddfcc Add new “salt.pkgrepo” state 10 years ago
  Wolodja Wentland c8c0781e8f Merge pull request #73 from rhertzog/standalone 10 years ago
  Raphaël Hertzog b93ec22244 Add a “salt.standalone” state 10 years ago
  Niels Abspoel 5029504212 Updated master config file to 2014.7 10 years ago
  Nitin Madhok b565c5f54c Merge pull request #71 from aboe76/improve_config 10 years ago
  Niels Abspoel af7f9d722a more improvements in _defaults.conf 10 years ago
  Seth House 0d8b10bb75 Merge pull request #70 from aboe76/fix_gitfs_spacing 10 years ago
  Niels Abspoel 4b0ec5dc01 Improved jinja spacing in template 10 years ago