 Forrest
|
13f06a8ae5
|
Merge pull request #273 from jerrykan/saltapi
Have salt-api service watch the master config files
|
2016-12-07 21:35:14 -08:00 |
|
|
Forrest
|
f3f2251d75
|
Merge pull request #271 from dafyddj/add-master-other-settings
allow non-default config settings in master.d/f_defaults.conf …
|
2016-12-01 14:13:04 -08:00 |
|
|
Forrest
|
111cbd44d1
|
Merge pull request #269 from mattwillsher/smartos-support
Correct SmartOS config path
|
2016-11-14 14:37:50 -08:00 |
|
|
Forrest
|
88794c8c62
|
Merge pull request #268 from mattwillsher/smartos-support
Add SmartOS salt-master, minion and gitfs support
|
2016-11-14 14:17:25 -08:00 |
|
|
Forrest
|
af02bc5b78
|
Merge pull request #266 from fizmat/arch-update
update map.jinja after Arch renamed the package
|
2016-11-10 09:15:02 -08:00 |
|
|
Forrest
|
01043740dc
|
Merge pull request #259 from kakwa/separate_engines_config
make the configuration of engines specific to master or minion
|
2016-11-09 12:08:33 -08:00 |
|
|
Forrest
|
f6551c5fc8
|
Merge pull request #265 from genuss/pillar_opts
Change default value for pillar_opts
|
2016-11-09 10:01:41 -08:00 |
|
|
Forrest
|
d6affbba39
|
Merge pull request #263 from robruma/feature/support_master_id_option
Adding support for master_id option
|
2016-10-14 09:35:34 -07:00 |
|
|
Forrest
|
07aa250925
|
Merge pull request #260 from mothbe/master
typo - top_file_merging_strategy (f_defaults.conf) template
|
2016-10-06 15:56:02 -07:00 |
|
|
Forrest
|
5e9c937931
|
Merge pull request #258 from aboe76/enable_salt_minion_standalone
fix minion daemon to be enabled if master_type is set to disable
|
2016-10-01 11:12:08 -07:00 |
|
|
Forrest
|
e76880d500
|
Merge pull request #257 from aboe76/salt-minion_standalone_with_service
add option to start minion service if master_type is set to disable
|
2016-10-01 00:50:25 -07:00 |
|
|
Forrest
|
e464109c92
|
Merge pull request #256 from aboe76/missing_files
add missing files
|
2016-09-30 13:43:17 -07:00 |
|
|
Forrest
|
894351b248
|
Merge pull request #255 from aboe76/minion_engines_reactors
add engine and reactor config to salt minion configuration
|
2016-09-30 12:44:16 -07:00 |
|
|
Forrest
|
ad440d904c
|
Merge pull request #250 from luitzifa/master
Fixes saltstack-formulas/salt-formula#190
|
2016-09-13 09:33:59 -07:00 |
|
|
Forrest
|
52bc1badca
|
Merge pull request #251 from UGNS/master
Clean-up master.d/f_defaults.conf and add winrepo_provider
|
2016-09-06 00:21:59 -07:00 |
|
|
Forrest
|
2a80f55a17
|
Merge pull request #249 from msciciel/salt-master-yaml-utf8
Add yaml_utf8 option to salt master configuration.
|
2016-08-24 09:47:52 -07:00 |
|
|
Forrest
|
5dd3eac097
|
Merge pull request #247 from mrichar1/other_opts
Handle config opts not part of default config.
|
2016-08-23 10:48:18 -07:00 |
|
|
Forrest
|
8050f6cf95
|
Merge pull request #243 from pcdummy/master
https for the ubuntu repo and option to remove /etc/salt/minion.
|
2016-07-15 09:02:57 -07:00 |
|
|
Forrest
|
55864f7cdf
|
Merge pull request #241 from pcdummy/mongodb
add support for mongodb settings
|
2016-07-07 10:22:18 -07:00 |
|
|
Forrest
|
e1b664f4d3
|
Merge pull request #240 from mwpher/master
Add support for OpenBSD in map.jinja
|
2016-07-01 19:49:46 -07:00 |
|
|
Forrest
|
5f03ce9db1
|
Merge pull request #234 from rhertzog/pkgrepo-update
Use repo.saltstack.com in salt.pkgrepo for Debian-based distributions
|
2016-06-30 09:21:18 -07:00 |
|
|
Forrest
|
137868bcc1
|
Merge pull request #237 from msonawane/master
add module_config for minions
|
2016-06-26 18:40:47 -07:00 |
|
|
Forrest
|
6b96bda5cd
|
Merge pull request #235 from rhertzog/master-config-fix
JSON encode values embedded in the salt-master's configuration file
|
2016-06-20 14:11:46 -07:00 |
|
|
Forrest
|
a96f7093fb
|
Merge pull request #226 from Sjd-Risca/lxcprofile
Lxcprofile
|
2016-06-07 11:09:58 -07:00 |
|
|
Forrest
|
3bc5aa3bce
|
Merge pull request #231 from rocket-labs-sysadmins/master
GitPython package name is fixed for RedHat-based OS
|
2016-05-30 11:32:02 -07:00 |
|
|
Forrest
|
d3476bae04
|
Merge pull request #230 from bersace/json-render
Render config as JSON
|
2016-05-29 22:43:29 -07:00 |
|
|
Forrest
|
7f41dff871
|
Merge pull request #229 from mchugh19/master
Support engine configuration
|
2016-05-27 21:40:39 -07:00 |
|
|
Forrest
|
76de5f9285
|
Merge pull request #227 from bradthurber/master-auth-ldap-support
Add support for master eauth LDAP config
|
2016-05-26 12:19:37 -07:00 |
|
|
Forrest
|
4388d06963
|
Merge pull request #225 from bradthurber/non-templated-cloud-config
Ability to create non-templated cloud maps/providers/profiles
|
2016-05-06 11:56:31 -07:00 |
|
|
Forrest
|
0a601fc310
|
Merge pull request #224 from bradthurber/allow-empty-gitfs-keys
allow gitfs.keys state to function without error when no keys
|
2016-05-02 10:26:00 -07:00 |
|
|
Forrest
|
8ed58c6528
|
Merge pull request #221 from bradthurber/new-gitfs-functionality
add new gitfs functionality
|
2016-04-28 12:37:53 -07:00 |
|
|
Forrest
|
4acd1711a2
|
Merge pull request #214 from irtnog/fix-paths-freebsd
Prefix configuration files with the suitable O/S-specific pathname
|
2016-03-29 11:23:08 -07:00 |
|
|
Forrest
|
ed4fcbc541
|
Merge pull request #213 from aboe76/spm_formula
add formula file this fixes #211
|
2016-03-27 12:04:29 -07:00 |
|
|
Forrest
|
59ee0c7761
|
Merge pull request #212 from genuss/mine_functions
Take mine_functions back
|
2016-03-25 11:43:13 -07:00 |
|
|
Forrest
|
7856b5ea9a
|
Merge pull request #210 from iamseth/master
Add Windows support to map.jinja
|
2016-03-22 18:23:35 -07:00 |
|
|
Forrest
|
7abdf217a9
|
Merge pull request #205 from myii/PR_FixWindowsRepoSettings
Fix Windows repo settings using values from 2015.8 documentation
|
2016-03-04 11:34:05 -08:00 |
|
|
Forrest
|
a8ced2e98f
|
Merge pull request #203 from aboe76/master_config_2015.8.7
merge options from 2015.8.7 version in f_defaults.conf
|
2016-02-20 13:26:15 -08:00 |
|
|
Forrest
|
8573ba96e2
|
Merge pull request #202 from irtnog/revert-pr200
Revert PR #200
|
2016-02-16 11:42:57 -08:00 |
|
|
Forrest
|
b47fec3564
|
Merge pull request #200 from thomaslarsen/master
Support for downloading formulas from multiple baseurls into same environment
|
2016-02-08 11:06:29 -08:00 |
|
|
Forrest
|
337c48b14c
|
Merge pull request #199 from kevinschmidt/master
add consul config support to master config file
|
2016-01-19 11:31:28 -08:00 |
|
|
Forrest
|
0fee3f58f2
|
Merge pull request #196 from iamseth/master
Replace pkgrepo with offical Saltstack repo
|
2016-01-17 20:07:50 -08:00 |
|
|
Forrest
|
8617db1536
|
Merge pull request #198 from kevinschmidt/master
add support for gitfs whitelist and blacklist
|
2016-01-13 11:35:56 -08:00 |
|
|
Forrest
|
46346e935f
|
Merge pull request #195 from vexxhost/master
Dropped ppa and updated to official repos for ubuntu
|
2015-12-24 13:09:36 -08:00 |
|
|
Forrest
|
ad009a68e3
|
Merge pull request #194 from msciciel/master
Add support for returner configuration in salt minion
|
2015-12-21 11:57:53 -08:00 |
|
|
Forrest
|
d58729e6c1
|
Merge pull request #191 from hemebond/master
Make Debian use pkgrepo.managed
|
2015-12-05 12:53:45 -08:00 |
|
|
Forrest
|
b00844fbe4
|
Merge pull request #189 from Sjd-Risca/test
fixed ext_pillar and master_tops to get more options
|
2015-11-18 11:08:46 -08:00 |
|
|
Forrest
|
a33937d9e8
|
Merge pull request #188 from abednarik/fix_deprecated_iteritems_method
Replace deprecated iteritems() with items()
|
2015-11-16 18:34:28 -08:00 |
|
|
Forrest
|
5c960fd2d8
|
Merge pull request #179 from blast-hardcheese/bugfix/178_master-configs-in-minion
Never fall back to `cfg_salt['master']` in minion config
|
2015-11-15 12:19:51 -08:00 |
|
|
Forrest
|
eeb7235ee0
|
Merge pull request #184 from 0xf10e/master
use salt_settings.syndic_service so state works on FreeBSD, too
|
2015-11-04 12:26:06 -08:00 |
|
|
Forrest
|
8d1b382343
|
Merge pull request #183 from babilen/dev-show-jid
Manage show_jid option in master configuration
|
2015-10-13 12:00:56 -07:00 |
|
|
Forrest
|
c2d6e0e49b
|
Merge pull request #173 from iggy/remove-mapping-test
Remove mapping test
|
2015-08-27 16:28:27 -07:00 |
|
|
Forrest
|
4c4ace6d55
|
Merge pull request #171 from spoage/better-pygit2-install
Improve flexibility/quality of pygit2 state
|
2015-08-20 10:28:07 -07:00 |
|
|
Forrest
|
bffb87c29f
|
Merge pull request #137 from puneetk/master
Remove Duplicates from defaults.yaml and map.jinja
|
2015-05-26 13:58:50 -07:00 |
|
|
Forrest
|
b36800f07e
|
Merge pull request #123 from andrew-vant/providers-oops
ec2/gce profiles/providers are no longer configured if they are not used
|
2015-04-17 10:27:28 -07:00 |
|
|
Forrest
|
6d12e55d51
|
Merge pull request #119 from smlloyd/master
Exclude require statement when install_packages is False.
|
2015-04-09 10:18:08 -07:00 |
|
|
Forrest
|
2247630ac8
|
Merge pull request #114 from irtnog/revert-salt_cloud_certs-pillar-lookup
[bugfix] Reverts lookup of salt_cloud_certs to original pillar key, in line with ...
|
2015-03-30 19:19:57 -07:00 |
|
|
Forrest
|
e6045d873a
|
Merge pull request #110 from iggy/master
Add modules to install gitfs backend dependencies
|
2015-03-25 19:57:51 -07:00 |
|
|
Forrest
|
d8bf7cdbf0
|
Merge pull request #108 from iggy/master
Add setting to not install packages
|
2015-03-25 19:20:42 -07:00 |
|
|
Forrest
|
611e78eb4d
|
Merge pull request #106 from iggy/cleanup_variable_overwriting
Don't overwrite salt variable
|
2015-03-17 15:27:00 -07:00 |
|
|
Forrest
|
ed0f2fab20
|
Merge pull request #98 from saxonww/master
don't try to load pkgrepo on non-Debian distros
|
2015-02-07 18:06:05 -08:00 |
|
|
Forrest
|
77c0ecd729
|
Merge pull request #78 from qbcode/master
Add saltify provider, map and profile templates
|
2014-12-24 12:45:01 -08:00 |
|
|
Forrest
|
c0af23f439
|
Merge pull request #79 from rhertzog/misc-bugfixes
Fix regression for old salt versions and bugfix for event_return_whitelist/event_return_blacklist options
|
2014-12-24 12:43:38 -08:00 |
|
|
Forrest
|
64a63eda93
|
Merge pull request #65 from PlayFab/master
Test if individual gitfs remote is string
|
2014-11-13 11:35:13 -08:00 |
|
|
Forrest
|
05087a8d42
|
Merge pull request #51 from andrew-vant/salt.d
Added recursive management of minion.d and master.d.
|
2014-10-06 09:15:53 -07:00 |
|
|
Forrest
|
095c6a8e4b
|
Merge pull request #50 from andrew-vant/rsprov
Added salt-cloud support for Rackspace OpenStack servers.
|
2014-10-03 18:58:59 -07:00 |
|
|
Forrest
|
4702e77756
|
Merge pull request #49 from johtso/issue-48
Avoid config key clashes
|
2014-10-03 11:46:55 -07:00 |
|
|
Forrest
|
760fa3ccdb
|
Merge pull request #40 from jacksoncage/salt-syndic
Added functionality to state for salt syndic daemon
|
2014-07-21 14:15:37 -07:00 |
|