218 Commits (2247630ac88926cd4d14731e8db968d5ddb21d9c)
 

Author SHA1 Message Date
  Forrest 2247630ac8 Merge pull request #114 from irtnog/revert-salt_cloud_certs-pillar-lookup 9 years ago
  Matthew X. Economou 943d7f2dc1 Reverts lookup of salt_cloud_certs to original pillar key, in line with existing documentation and the certificate template file. 9 years ago
  Nitin Madhok 74d9ce2a01 Merge pull request #112 from aboe76/fix_api_recursion 9 years ago
  Niels Abspoel 9ae8a4d746 Fix recursion in api.service 9 years ago
  Forrest e6045d873a Merge pull request #110 from iggy/master 9 years ago
  Brian Jackson 4533cc7d0e Add modules to install gitfs backend dependencies 9 years ago
  Forrest d8bf7cdbf0 Merge pull request #108 from iggy/master 9 years ago
  Brian Jackson 924c04c0d8 Add setting to not install packages 9 years ago
  Nitin Madhok 751613db7c Merge pull request #107 from iggy/master 9 years ago
  Brian Jackson 86c7b0a3e5 Add note about config option 9 years ago
  Brian Jackson 8ebb7f57df Stop using clean: True on /etc/salt/{minion,master}.d 9 years ago
  Nitin Madhok 2118cc0905 Update LICENSING year 9 years ago
  Forrest 611e78eb4d Merge pull request #106 from iggy/cleanup_variable_overwriting 9 years ago
  Brian Jackson cb3aa80c62 Don't overwrite salt variable 9 years ago
  Nitin Madhok 6a1fc70477 Merge pull request #102 from aboe76/salt-api 9 years ago
  Niels Abspoel 5785091305 Added salt-api support 9 years ago
  Nitin Madhok 61a7bc1ddc Merge pull request #101 from aboe76/fix_opensuse 9 years ago
  Niels Abspoel 5d09355c84 fix suse os_family 9 years ago
  Nitin Madhok ab93f6f1dc Merge pull request #100 from aboe76/mine_interval_minion 9 years ago
  Niels Abspoel 90f23948ef create config option for mine_interval 9 years ago
  Nitin Madhok cde11bc1e8 Merge pull request #99 from aboe76/mine_get_master 9 years ago
  Niels Abspoel b8e53771f3 add mine_get function to master config 9 years ago
  Forrest ed0f2fab20 Merge pull request #98 from saxonww/master 9 years ago
  Will Saxon ae8e4ca492 don't try to load pkgrepo on non-Debian distros 10 years ago
  Nitin Madhok 1b13259823 Merge pull request #97 from aboe76/multi_master 9 years ago
  Niels Abspoel 23fd8b64af Fix #39 multi master support to minion 9 years ago
  Nitin Madhok 22fe873c5b Merge pull request #96 from aboe76/rest_tornado 9 years ago
  Niels Abspoel 7ddc1692ec added rest_tornado to _defaults.conf 9 years ago
  Nitin Madhok f39fff2329 Merge pull request #90 from aboe76/master 9 years ago
  Niels Abspoel de71de216e Merge pull request #94 from jcftang/master 9 years ago
  Jimmy Tang 2e30a44e41 saltify provider should set correct master 9 years ago
  Nitin Madhok f2131b05f3 Merge pull request #92 from saltstack-formulas/revert-91-master 9 years ago
  Nitin Madhok fa6c39eccd Revert "Add mine_functions to master config template" 9 years ago
  Nitin Madhok 5cec66107a Merge pull request #91 from qbcode/master 9 years ago
  Jimmy Tang deee69319f Add mine_functions to master config template 9 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