843 Commits (3ab819a80767e216074b0298b2854dfe777a04f7)
 

Author SHA1 Message Date
  Nitin Madhok e237a7dbbb Merge pull request #46 from johtso/issue-45 10 years ago
  Johannes 247e6403a7 Add missing .conf to config files 10 years ago
  Nitin Madhok 1259f3eed8 Merge pull request #44 from jacksoncage/config-files 10 years ago
  Love Nyberg 75a1f888eb #12 Moved master and minion config file to .d 10 years ago
  Nitin Madhok fba928096b Merge pull request #43 from danielfrg/patch-1 10 years ago
  Daniel Rodriguez 3bdf2789a1 Added rest_cherrypy section 10 years ago
  Nitin Madhok 6a6b02b418 Update README.rst 10 years ago
  Seth House 6c0cc53d5c Merge pull request #42 from westurner/fix-nested-_roots 10 years ago
  Joseph Hall 5bd3d62b42 Merge pull request #41 from jacksoncage/salt-cloud 10 years ago
  Love Nyberg 6405354299 Fixed merge conflict and rearaged readme. 10 years ago
  Love Nyberg 4226594c7c Merge pull request #1 from saltstack-formulas/master 10 years ago
  Wes Turner bc7ccedf45 Fix nested file,pillar _roots in minion and master templates 10 years ago
  Forrest 760fa3ccdb Merge pull request #40 from jacksoncage/salt-syndic 10 years ago
  Love Nyberg e798b46c8a Added functionality to state for salt syndic deamon. 10 years ago
  Love Nyberg 85ce73a839 Added functionality to state for salt cloud and exampel for EC2 and GCE 10 years ago
  Erik Johnson 74acda8071 Merge pull request #38 from mogman1/master 10 years ago
  Shaun Carlson 9b730fc0c8 Fixed typo in autoreject_file setting 10 years ago
  Seth House 23ef33b675 Merge pull request #37 from z-saltstack/fixed_file_roots 10 years ago
  Oleg Tsarev 94da2654e2 Fixed file_roots config generation with several environment 10 years ago
  Forrest 077cfd6b71 Merge pull request #33 from raizyr/upstream 10 years ago
  Chris McNabb 028412ee5e use master when if in master 10 years ago
  Seth House 56e679d863 Merge pull request #32 from johtso/patch-1 10 years ago
  Johannes 14055d2bb8 Update formula docs URL 10 years ago
  Joseph Hall 664091a649 Merge pull request #31 from raizyr/add_amazon_os 10 years ago
  Chris McNabb d0392b576e add Amazon os 10 years ago
  Forrest d286e47a32 Merge pull request #25 from z-saltstack/master 10 years ago
  Oleg Tsarev 18d7471198 Supported Arch Linux 10 years ago
  Oleg Tsarev e3b2ebeb06 Actualized master and minion config files templates 10 years ago
  Joseph Hall 790065559c Merge pull request #24 from gravyboat/master 10 years ago
  Forrest Alvarez 9e84f26fba Fixed formatting in readme. 10 years ago
  Seth House 54d2772a2e Merge pull request #23 from gravyboat/master 10 years ago
  Forrest Alvarez c7b1f081f7 Updated readme to match standards 10 years ago
  Joseph Hall 4dadffc28d Merge pull request #21 from tiger-seo/master 11 years ago
  tiger-seo 507f2abc1a possibility to define Halite configuration for salt-master 11 years ago
  Seth House e45258d633 Merge pull request #19 from tiger-seo/master 11 years ago
  tiger-seo f4b839a4fb sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion 11 years ago
  David Boucha bea689e977 Merge pull request #17 from KennethWilke/master 11 years ago
  Kenneth Wilke 9404ebf915 Added module_config section to minion template 11 years ago
  Seth House fbda93c5e4 Merge pull request #16 from KennethWilke/master 11 years ago
  Kenneth Wilke d337cc2784 Merge branch 'master' of https://github.com/saltstack-formulas/salt-formula 11 years ago
  Kenneth Wilke e3a29bf69a ext_pillar fix 11 years ago
  Kenneth Wilke 1f71bef33b jijna syntax fix 11 years ago
  Kenneth Wilke e104b3eb41 fixed ext_pillar 11 years ago
  Kenneth Wilke 426493b76d fixed ext_pillar 11 years ago
  Seth House ca231053f2 Merge pull request #15 from Linuturk/master 11 years ago
  Justin Phelps 6282d9570c Corrected the typo for the minion configuration file. 11 years ago
  Kenneth Wilke c080cf37d6 ext_pillar fix 11 years ago
  Kenneth Wilke e83d25b80f newline fix 11 years ago
  Kenneth Wilke 98fd674c95 indentation fix 11 years ago
  Kenneth Wilke 92b2572734 newline fix 11 years ago