Commit Graph

  • a8227385cc Typo fix Nitin Madhok 2014-11-06 14:23:52 -0500
  • c6c8958aac Removing crypto pip dependency for complete Debian family Nitin Madhok 2014-11-06 14:11:19 -0500
  • f84a0c4a9f Removing crypto pip dependency for Ubuntu and Debian Nitin Madhok 2014-11-06 13:33:53 -0500
  • 5f967781bc Merge pull request #61 from saltstack-formulas/revert-60-cryptodep Nitin Madhok 2014-11-05 14:59:38 -0500
  • bb09803f90 Revert "Removed crypto dependency from salt.cloud." Nitin Madhok 2014-11-05 14:59:26 -0500
  • b0284ad590 Merge pull request #60 from andrew-vant/cryptodep Nitin Madhok 2014-11-05 13:03:31 -0500
  • 5a6302e021 Removed crypto dependency from salt.cloud. Andrew Vant 2014-11-04 16:44:28 -0500
  • 8100753f71 Merge pull request #58 from juiceinc/ssh-roster Nitin Madhok 2014-10-28 12:58:07 -0400
  • cfa1f4eafc fix syntax issues in package-map.jinja Tim O'Guin 2014-10-28 11:50:23 -0500
  • a3c54f0e8f added salt-ssh to package-map.jinja for most OS families Tim O'Guin 2014-10-28 11:46:38 -0500
  • cde16097ed add support for installing salt-ssh and managing the roster file, updated README and pillar.example Tim O'Guin 2014-10-28 11:45:32 -0500
  • 4e32c5e6ee Merge pull request #57 from juiceinc/master Nitin Madhok 2014-10-28 11:58:29 -0400
  • 9fa42fe09d fixed YAML issue with templated reactor config Tim O'Guin 2014-10-28 10:55:18 -0500
  • 69b2ee3812 Merge pull request #56 from juiceinc/master Nitin Madhok 2014-10-24 17:45:07 -0700
  • 3d52dfd8ec added proper indentation for jinja conditionals in reactor template Tim O'Guin 2014-10-24 17:04:12 -0500
  • 2852e7b897 add templated file for reactor configuration and update pillar.example. Tim O'Guin 2014-10-24 14:48:56 -0500
  • 3e4d9d012b Merge pull request #55 from OneID/feature/gitfs-repo-options Nitin Madhok 2014-10-23 23:32:14 -0700
  • 9dab2f9dab Update pillar.example to show gitfs_remotes option usage Ajna Cackovic 2014-10-23 17:43:23 -0700
  • 2b51a6f0c3 Allow repo options to be set per repo for gitfs_remotes in pillar Ajna Cackovic 2014-10-23 17:39:21 -0700
  • a836857bdf Update pillar.example to show gitfs_remotes option usage Ajna Cackovic 2014-10-23 17:43:23 -0700
  • 378e284cd2 Allow repo options to be set per repo for gitfs_remotes in pillar Ajna Cackovic 2014-10-23 17:39:21 -0700
  • 2013d4b499 Merge pull request #53 from ZetaBit/vagrant Nitin Madhok 2014-10-17 09:46:15 -0400
  • ca4a58ec1a Added a basic description of Vagrant usage. Martin Griesbach 2014-10-17 10:21:24 +0200
  • 0c0b1745a8 Vagrant: increased wait to ensure the minion sent it's key to the master before Accepting all keys. Martin Griesbach 2014-10-17 09:46:33 +0200
  • 862421e80f Added a Vagrant setup to instantly test the formula Martin Griesbach 2014-10-16 17:30:04 +0200
  • 1682df8592 Merge remote-tracking branch 'origin/pr/47' Seth House 2014-10-09 16:39:07 -0600
  • 51e493e448 Merge pull request #52 from andrew-vant/salt.d.doc Nitin Madhok 2014-10-06 12:36:50 -0400
  • 013736e2ca Readme note about user-provided configuration templates. Andrew Vant 2014-10-06 12:28:34 -0400
  • 05087a8d42 Merge pull request #51 from andrew-vant/salt.d Forrest 2014-10-06 09:15:53 -0700
  • 00e245e20a Added recursive management of minion.d and master.d. Andrew Vant 2014-10-06 11:17:43 -0400
  • bc002a3783 Merge 829a139cf3 into 095c6a8e4b Tyler Mandry 2014-10-05 23:17:12 +0000
  • 095c6a8e4b Merge pull request #50 from andrew-vant/rsprov Forrest 2014-10-03 18:58:59 -0700
  • 970da0ef37 Added salt-cloud support for Rackspace OpenStack servers. Andrew Vant 2014-10-03 21:14:38 -0400
  • 4702e77756 Merge pull request #49 from johtso/issue-48 Forrest 2014-10-03 11:46:55 -0700
  • 791025e065 Avoid config key clashes Johannes 2014-10-03 09:43:59 +0100
  • 4675d68bd8 Initial FreeBSD support Kevin Bowling 2014-10-02 00:20:29 -0700
  • b6d78a415d Add FreeBSD to the package-map Kevin Bowling 2014-10-01 23:54:30 -0700
  • 8c10d8c776 Pillar example whitespace Kevin Bowling 2014-10-01 23:44:48 -0700
  • e237a7dbbb Merge pull request #46 from johtso/issue-45 Nitin Madhok 2014-10-01 13:39:15 -0400
  • 247e6403a7 Add missing .conf to config files Johannes 2014-10-01 18:37:09 +0100
  • 2ea9526628 adding support for multiple providers/profiles Brian Jackson 2014-09-09 14:54:04 -0500
  • 1259f3eed8 Merge pull request #44 from jacksoncage/config-files Nitin Madhok 2014-09-08 15:43:55 -0400
  • 75a1f888eb #12 Moved master and minion config file to .d Love Nyberg 2014-09-08 21:38:30 +0200
  • 444a516456 test Brian Jackson 2014-09-05 19:15:43 -0500
  • 259658231f test Brian Jackson 2014-09-05 19:11:01 -0500
  • 44b6c3591a test Brian Jackson 2014-09-05 19:06:44 -0500
  • c74b844259 test Brian Jackson 2014-09-05 18:54:44 -0500
  • 6533078cc6 test Brian Jackson 2014-09-05 18:51:38 -0500
  • e264ad3e5b test Brian Jackson 2014-09-05 18:48:27 -0500
  • bb7512a4a5 test Brian Jackson 2014-09-05 18:47:43 -0500
  • 4df67495f8 test Brian Jackson 2014-09-05 18:44:54 -0500
  • fa236626ef test Brian Jackson 2014-09-05 18:37:27 -0500
  • a1bb1a9fd5 test Brian Jackson 2014-09-05 18:33:55 -0500
  • de92ee353a test Brian Jackson 2014-09-05 18:01:57 -0500
  • d9a19cdc8d test Brian Jackson 2014-09-05 17:53:26 -0500
  • 20083cfb6a test Brian Jackson 2014-09-05 17:41:03 -0500
  • 213d059456 test Brian Jackson 2014-09-05 17:39:10 -0500
  • b587958212 more flexible providers setup Brian Jackson 2014-09-05 17:34:06 -0500
  • 0d2d34b193 test Brian Jackson 2014-09-05 17:25:08 -0500
  • b36ea89423 test Brian Jackson 2014-09-05 17:20:09 -0500
  • 4432d5f75c test Brian Jackson 2014-09-05 17:13:34 -0500
  • d227f1e831 more flexible providers setup Brian Jackson 2014-09-05 17:03:13 -0500
  • 873e9924ea more flexible providers setup Brian Jackson 2014-09-05 16:24:14 -0500
  • b515934995 Merge 970605ad6d into fba928096b Oleg Tsarev 2014-08-23 05:17:17 +0000
  • fba928096b Merge pull request #43 from danielfrg/patch-1 Nitin Madhok 2014-08-22 23:00:28 -0500
  • 3bdf2789a1 Added rest_cherrypy section Daniel Rodriguez 2014-08-22 22:57:21 -0500
  • 6a6b02b418 Update README.rst Nitin Madhok 2014-07-30 12:32:45 -0400
  • 6c0cc53d5c Merge pull request #42 from westurner/fix-nested-_roots Seth House 2014-07-23 11:45:29 -0600
  • 5bd3d62b42 Merge pull request #41 from jacksoncage/salt-cloud Joseph Hall 2014-07-22 06:13:55 -0600
  • 6405354299 Fixed merge conflict and rearaged readme. Love Nyberg 2014-07-22 10:24:09 +0200
  • 4226594c7c Merge pull request #1 from saltstack-formulas/master Love Nyberg 2014-07-22 10:20:46 +0200
  • bc7ccedf45 Fix nested file,pillar _roots in minion and master templates Wes Turner 2014-07-22 00:43:24 -0500
  • 760fa3ccdb Merge pull request #40 from jacksoncage/salt-syndic Forrest 2014-07-21 14:15:37 -0700
  • e798b46c8a Added functionality to state for salt syndic deamon. Love Nyberg 2014-07-20 17:05:53 +0200
  • 85ce73a839 Added functionality to state for salt cloud and exampel for EC2 and GCE Love Nyberg 2014-07-20 16:59:38 +0200
  • e9ef8f26d2 Merge 95029b4fdc into 74acda8071 Chris McNabb 2014-07-08 22:02:12 +0000
  • 74acda8071 Merge pull request #38 from mogman1/master Erik Johnson 2014-06-05 16:36:02 -0500
  • 9b730fc0c8 Fixed typo in autoreject_file setting Shaun Carlson 2014-06-05 14:16:57 -0600
  • 23ef33b675 Merge pull request #37 from z-saltstack/fixed_file_roots Seth House 2014-05-10 12:26:57 -0600
  • 94da2654e2 Fixed file_roots config generation with several environment Oleg Tsarev 2014-05-10 15:20:09 +0200
  • 970605ad6d actualized minion config to 2014.1.3 Oleg Tsarev 2014-04-24 00:14:23 +0200
  • fbb8386153 actualized master config to 2014.1.3 Oleg Tsarev 2014-04-24 00:06:43 +0200
  • 077cfd6b71 Merge pull request #33 from raizyr/upstream Forrest 2014-03-29 16:19:22 -0700
  • 028412ee5e use master when if in master Chris McNabb 2014-03-28 15:13:33 -0400
  • 56e679d863 Merge pull request #32 from johtso/patch-1 Seth House 2014-03-27 16:57:50 -0600
  • 14055d2bb8 Update formula docs URL Johannes 2014-03-27 22:53:04 +0000
  • 664091a649 Merge pull request #31 from raizyr/add_amazon_os Joseph Hall 2014-03-19 12:48:23 -0600
  • 82408f6a65 Merge 3bed12c756 into d286e47a32 Chris McNabb 2014-03-19 18:31:37 +0000
  • 3bed12c756 Modify package-map so that it looks for the package_table in the salt-formula specific portion of pillar. Fall back to using the hard coded package_table if the os isn't in pillar's table Chris McNabb 2014-03-19 14:19:11 -0400
  • 95029b4fdc Modify package-map so that it looks for the package_table in the salt-formula specific portion of pillar. Fall back to using the hard coded package_table if the os isn't in pillar's table Chris McNabb 2014-03-19 14:19:11 -0400
  • d0392b576e add Amazon os Chris McNabb 2014-03-19 14:06:27 -0400
  • 829a139cf3 Allow more flexibility in setting mine function parameters Tyler Mandry 2014-03-11 15:59:19 -0500
  • e1e6a883a8 Add mine_interval option to minion. Tyler Mandry 2014-03-10 22:21:55 -0500
  • 511b5d8d30 Add mine_functions section to minion config Tyler Mandry 2014-03-10 21:39:01 -0500
  • d286e47a32 Merge pull request #25 from z-saltstack/master Forrest 2014-02-10 20:37:25 -0700
  • 18d7471198 Supported Arch Linux Oleg Tsarev 2014-02-11 07:16:31 +0400
  • e3b2ebeb06 Actualized master and minion config files templates Oleg Tsarev 2014-02-11 06:59:22 +0400
  • 790065559c Merge pull request #24 from gravyboat/master Joseph Hall 2014-02-08 05:38:10 -0700
  • 9e84f26fba Fixed formatting in readme. Forrest Alvarez 2014-02-08 05:47:47 +0000
  • 54d2772a2e Merge pull request #23 from gravyboat/master Seth House 2014-01-28 16:49:06 -0800