Commit Graph

  • a96f7093fb Merge pull request #226 from Sjd-Risca/lxcprofile Forrest 2016-06-07 11:09:58 -0700
  • ca42d40ef9 added support for LXC profiles risca 2016-06-07 19:46:08 +0200
  • cc63770882 Merge ae1e60e714 into 3bc5aa3bce Frits Vlaanderen 2016-06-02 18:39:55 +0000
  • 3bc5aa3bce Merge pull request #231 from rocket-labs-sysadmins/master Forrest 2016-05-30 11:32:02 -0700
  • f16e012687 Merge pull request #1 from TiagoTT/patch-1 kabakaev 2016-05-30 14:56:44 +0200
  • 6690e8b103 Fixing GitPython package name for RedHat OS family. Tested on CentOS 7. Tiago Teresa Teodósio 2016-05-30 13:50:16 +0200
  • d3476bae04 Merge pull request #230 from bersace/json-render Forrest 2016-05-29 22:43:29 -0700
  • adad72741e Render config as JSON Étienne BERSAC 2016-05-29 20:42:41 +0200
  • 7f41dff871 Merge pull request #229 from mchugh19/master Forrest 2016-05-27 21:40:39 -0700
  • ac4ed62c03 Support engine configuration Christian McHugh 2016-05-27 22:35:15 -0500
  • 76de5f9285 Merge pull request #227 from bradthurber/master-auth-ldap-support Forrest 2016-05-26 12:19:37 -0700
  • b9ae603fd7 Add support for master eauth LDAP config Brad Thurber 2016-05-26 10:52:10 -0400
  • 4388d06963 Merge pull request #225 from bradthurber/non-templated-cloud-config Forrest 2016-05-06 11:56:31 -0700
  • b3a3fa4d72 Ability to create non-templated cloud config files (maps/providers/profiles). Brad Thurber 2016-05-06 14:45:41 -0400
  • 0a601fc310 Merge pull request #224 from bradthurber/allow-empty-gitfs-keys Forrest 2016-05-02 10:26:00 -0700
  • d2df211011 allow state to function without errors if no keys are find in pilar Brad Thurber 2016-05-02 09:13:38 -0400
  • 8ed58c6528 Merge pull request #221 from bradthurber/new-gitfs-functionality Forrest 2016-04-28 12:37:53 -0700
  • 39479cafe9 add missing gitfs parms to minion config file as well (for use by standalone minions) Brad Thurber 2016-04-28 09:43:13 -0400
  • b828025565 convert abspath jinja URIs to relapath for _root and _mountpoint gitfs support Niklauz 2016-04-24 15:53:38 -0400
  • 939aa37028 Cleanup and make closer to the PR submitted for the mainline salt repo master config file Brad Thurber 2016-04-20 15:10:55 -0400
  • c4ef48c5e8 add new gitfs functionality Brad Thurber 2016-04-19 12:51:17 -0400
  • 6578fb2ae2 Merge pull request #219 from UtahDave/master puneet kandhari 2016-04-04 13:31:54 -0500
  • 8a0f67f8b7 Install latest stable version of Salt Robert Hedges 2016-04-04 13:29:13 -0500
  • cca75d93d7 Use the latest stable salt from repo.saltstack.com David Boucha 2016-04-04 12:28:35 -0600
  • d0d4a6cc6b Merge pull request #218 from UtahDave/master puneet kandhari 2016-04-04 13:05:02 -0500
  • 08501c9e18 Comment out second master config example David Boucha 2016-04-04 11:48:20 -0600
  • 633ce3630f Merge pull request #216 from centromere/driver-version-check Wolodja Wentland 2016-04-01 08:22:01 +0200
  • e26b805279 Added version check for provider/driver backwards compatibility John Galt 2016-03-31 23:17:35 -0700
  • 29d4a55828 Merge pull request #215 from centromere/provider-fix Nitin Madhok 2016-03-31 22:48:17 -0400
  • c4208bb661 Renamed "provider" to "driver" John Galt 2016-03-31 19:39:55 -0700
  • 4acd1711a2 Merge pull request #214 from irtnog/fix-paths-freebsd Forrest 2016-03-29 11:23:08 -0700
  • abe9b91e66 Replace reference to slspath with the complete URL of the source file Matthew X. Economou 2016-03-29 13:36:46 -0400
  • 001b034eb5 Replace absolute config pathname prefixes with the config_path variable Matthew X. Economou 2016-03-29 13:28:47 -0400
  • ed4fcbc541 Merge pull request #213 from aboe76/spm_formula Forrest 2016-03-27 12:04:29 -0700
  • 398d71d392 add formula file Niels Abspoel 2016-03-27 12:36:48 +0200
  • 59ee0c7761 Merge pull request #212 from genuss/mine_functions Forrest 2016-03-25 11:43:13 -0700
  • e97822a0d5 Take mine_functions back a.genus 2016-03-25 16:57:06 +0300
  • 7856b5ea9a Merge pull request #210 from iamseth/master Forrest 2016-03-22 18:23:35 -0700
  • c7552b6d0a Add Windows support to map.jinja Seth Miller 2016-03-22 20:15:44 -0500
  • f3ce57252a Allow nesting commands under minion names in master ACL config John Carlyle-Clarke 2016-03-17 15:06:01 +0000
  • 8eabd29c1c Allow nesting commands under minion names in master ACL config John Carlyle-Clarke 2016-03-17 14:58:23 +0000
  • 30909c7c1b install python-tornado package in case rest_tornado is used Tobias Jungel 2016-03-09 10:43:11 +0100
  • 7abdf217a9 Merge pull request #205 from myii/PR_FixWindowsRepoSettings Forrest 2016-03-04 11:34:05 -0800
  • 7f36259614 Remove excessive blank lines rendered after "Miscellaneous settings" Imran Iqbal 2016-03-04 11:36:16 +0000
  • c4e116ee8f Provide Windows repo settings: 2015.8+ master used for pre-2015.8 minions Imran Iqbal 2016-03-04 11:30:19 +0000
  • 7474d4239d Fix Windows repo settings using values from 2015.8 documentation Imran Iqbal 2016-03-04 11:27:45 +0000
  • 043433b90a Merge pull request #204 from aboe76/master Nitin Madhok 2016-02-20 18:11:57 -0500
  • a4c5b4f322 update 2015.8.7 version config for the minion Niels Abspoel 2016-02-20 23:25:06 +0100
  • a8ced2e98f Merge pull request #203 from aboe76/master_config_2015.8.7 Forrest 2016-02-20 13:26:15 -0800
  • bfcaca38a6 merge options from 2015.8.7 version in f_defaults.conf Niels Abspoel 2016-02-20 21:07:17 +0100
  • 8573ba96e2 Merge pull request #202 from irtnog/revert-pr200 Forrest 2016-02-16 11:42:57 -0800
  • e8021220b8 Revert PR #200 Matthew X. Economou 2016-02-16 10:20:42 -0500
  • b47fec3564 Merge pull request #200 from thomaslarsen/master Forrest 2016-02-08 11:06:29 -0800
  • bbeacc4ace Fixed typo in `pillar.example` Thomas Larsen 2016-02-08 14:01:47 +0000
  • d1cbec3fe2 Added support for downloading formulas from multiple baseurls into the same environment. Thomas Larsen 2016-02-08 13:45:09 +0000
  • ae1e60e714 Merge pull request #2 from saltstack-formulas/master Frits 2016-01-26 10:03:11 +0100
  • 337c48b14c Merge pull request #199 from kevinschmidt/master Forrest 2016-01-19 11:31:28 -0800
  • ce6849247e add consul config support Kevin Schmidt 2016-01-13 13:04:22 +0000
  • 0fee3f58f2 Merge pull request #196 from iamseth/master Forrest 2016-01-17 20:07:50 -0800
  • 741ffb81ac Merge pull request #1 from saltstack-formulas/master Frits 2016-01-15 16:02:54 +0100
  • 8617db1536 Merge pull request #198 from kevinschmidt/master Forrest 2016-01-13 11:35:56 -0800
  • 41f2de74bd * add gitfs whitelist and blacklist Kevin Schmidt 2015-12-11 12:42:16 +0000
  • adb0c7008d removing accidentally committed files Niels Abspoel 2016-01-09 21:45:23 +0100
  • cbe5763668 fix pillar and libvirt Niels Abspoel 2016-01-09 19:39:47 +0100
  • 8f2191471b Replace pkgrepo with offical Saltstack repo Seth Miller 2016-01-08 11:21:22 -0600
  • 46346e935f Merge pull request #195 from vexxhost/master Forrest 2015-12-24 13:09:36 -0800
  • 3b8669cd67 dropped ppa and updated to official repos for ubuntu Mohammed Naser 2015-12-24 13:28:35 -0500
  • ddc20041f1 Merge 9da6cd408a into ad009a68e3 Shane Sveller 2015-12-22 12:42:07 +0000
  • ad009a68e3 Merge pull request #194 from msciciel/master Forrest 2015-12-21 11:57:53 -0800
  • f1c941a6a8 Merge pull request #1 from msciciel/github msciciel 2015-12-21 15:17:44 +0100
  • 02be0b1367 add support for returner setting in minion configuration Krzysztof Pawłowski 2015-12-21 15:00:35 +0100
  • 422888cf77 Merge branch 'github' into itg Krzysztof Pawłowski 2015-12-21 14:55:21 +0100
  • 5d1368d936 Merge pull request #192 from hemebond/master Wolodja Wentland 2015-12-09 19:20:13 +0100
  • 6d9683ca1f Add clean_file to wipe saltstack.list contents James O'Neill 2015-12-09 23:33:00 +1300
  • d58729e6c1 Merge pull request #191 from hemebond/master Forrest 2015-12-05 12:53:45 -0800
  • 87f3e849d2 Make Debian use pkgrepo.managed and allow the repo name and key_url to be overridden via Pillar lookup. James O'Neill 2015-12-05 23:24:05 +1300
  • bec5342009 Merge 23eb122aa9 into b00844fbe4 John Carlyle-Clarke 2015-11-19 12:36:07 +0000
  • b00844fbe4 Merge pull request #189 from Sjd-Risca/test Forrest 2015-11-18 11:08:46 -0800
  • 3a83533669 fixed ext_pillar according to https://docs.saltstack.com/en/latest/topics/development/external_pillars.html#configuration and master_tops according to https://docs.saltstack.com/en/latest/topics/master_tops/index.html risca 2015-11-18 19:56:35 +0100
  • a33937d9e8 Merge pull request #188 from abednarik/fix_deprecated_iteritems_method Forrest 2015-11-16 18:34:28 -0800
  • 8b39b37762 Replace deprecated iteritems() with items() abednarik 2015-11-16 22:05:36 -0300
  • 5c960fd2d8 Merge pull request #179 from blast-hardcheese/bugfix/178_master-configs-in-minion Forrest 2015-11-15 12:19:51 -0800
  • d730d4f2b8 Using cfg_salt['master'] is never the right answer Devon Stewart 2015-10-06 17:13:25 -0700
  • eeb7235ee0 Merge pull request #184 from 0xf10e/master Forrest 2015-11-04 12:26:06 -0800
  • 9da6cd408a Update Vagrant bootstrap to use new APT repo Shane Sveller 2015-10-19 18:44:58 -0500
  • e264158e09 Update saltstack.pkgrepo to use new APT repo on Ubuntu Shane Sveller 2015-10-19 18:44:29 -0500
  • 8d1b382343 Merge pull request #183 from babilen/dev-show-jid Forrest 2015-10-13 12:00:56 -0700
  • 52803ea883 Merge pull request #185 from babilen/dev-trailing-whitespace puneet kandhari 2015-10-13 09:09:51 -0700
  • 0216d66527 Remove trailing whitespace from master config Wolodja Wentland 2015-10-13 16:37:14 +0200
  • d7382e2d1f use salt_settings.syndic_service so state works on FreeBSD, too root 2015-10-13 15:41:41 +0200
  • 52893bc978 Manage show_jid in master configuration Wolodja Wentland 2015-10-13 14:56:51 +0200
  • 8d098484ed Merge pull request #164 from genuss/sign_pubkey puneet kandhari 2015-09-29 09:44:14 -0700
  • 32d2de264f Merge pull request #176 from irtnog/fix-formulas-mapping-values-not-allowed-render-error Brian Jackson 2015-09-03 14:28:56 -0500
  • 827ed47a25 Filter all calls to formulas_git_opt through load_yaml Matthew X. Economou 2015-09-03 14:56:45 -0400
  • 4983fc52e9 Merge pull request #174 from spoage/fix-git-id-conflict puneet kandhari 2015-09-02 09:02:06 -0500
  • f0e691fa13 Fixed conflict with git-formula by allowing either inclusion of formula to install git dependency or specify a package name to install with a custom state ID. Shane Poage 2015-09-01 16:28:27 -0500
  • c2d6e0e49b Merge pull request #173 from iggy/remove-mapping-test Forrest 2015-08-27 16:28:27 -0700
  • 9779609bc4 Remove mapping test Brian Jackson 2015-08-27 17:37:53 -0500
  • 4c4ace6d55 Merge pull request #171 from spoage/better-pygit2-install Forrest 2015-08-20 10:28:07 -0700
  • addc6d5a26 Added logic to properly install pygit2 on ubuntu systems and made the pygit2 installation more flexible in general. Shane Poage 2015-08-19 23:46:49 -0500