511 Commits

Author	SHA1	Message	Date
Felix Dreissig	5b55fb2452	Fix comments about the "hash_type" option ... Previous mentions of the correct default value (it really is sha256) somehow got lost along the way. Also, some comments seem to have gotten duplicated instead of updated.	2017-05-09 11:10:29 -06:00
rallytime	fc756c595c	Merge branch '2016.3' into '2016.11' ... Conflicts: - doc/ref/configuration/master.rst - salt/config/__init__.py	2017-05-02 12:52:59 -06:00
Mike Place	8ab321f934	A random startup delay option for minions ... This allows minions to spread out the load to the master if a large number of them start up at once.	2017-04-18 08:34:56 -06:00
C. R. Oldham	65ea8997b7	Add allow_minion_key_revoke config option	2017-04-17 13:20:45 -06:00
Daniel Wallace	a86b101ae6	add retries on authentications of the salt minion reconnecting	2017-04-10 14:53:26 -06:00
Dmitry Kuzmenko	82c45b1a52	Memcache documentation and minor updates.	2017-04-03 19:51:50 +03:00
Mike Place	1dba2f9cb0	Add warning in docs	2017-02-22 11:44:38 -07:00
rallytime	fdaa5ac1b0	Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/master.py - salt/pillar/__init__.py - salt/utils/__init__.py	2017-01-26 14:09:37 -07:00
Erik Johnson	6b014e53fc	Rename on_demand_pillar to on_demand_ext_pillar	2017-01-25 15:08:57 -06:00
Erik Johnson	d216f90c63	Document new on_demand_pillar option and add to config template	2017-01-25 14:43:14 -06:00
Bo Maryniuk	ffbd45062e	Explain what it is about and how to configure that	2017-01-18 15:02:11 +01:00
rallytime	30e8a66fb0	Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/netapi/rest_tornado/saltnado.py - tests/integration/netapi/rest_tornado/test_app.py	2017-01-16 18:54:14 -07:00
rallytime	d24776f5e9	Merge branch '2015.8' into '2016.3' ... Conflicts: - conf/master - doc/topics/netapi/index.rst - salt/netapi/__init__.py	2017-01-15 16:07:55 -07:00
rallytime	b910499dbe	Various follow up fixes ... Merge branch '2015.8.12_follow_up' into '2015.8'	2017-01-13 14:40:17 -07:00
Bo Maryniuk	9b0a786aeb	Explain what it is about and how to configure that	2017-01-06 15:29:25 -05:00
rallytime	efb8a8ddf5	Merge branch '2016.3' into '2016.11' ... Conflicts: - doc/ref/configuration/minion.rst - salt/config/__init__.py - salt/minion.py	2016-12-22 10:39:14 -07:00
Mike Place	6ee7b2bae7	Merge pull request #38377 from DSRCorporation/features/consul_cache ... Implementation and docs for Consul key-value store plugin for minion data cache.	2016-12-20 13:36:01 -07:00
Stefan Priebe	52fc6daac0	ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog)	2016-12-20 09:55:31 -07:00
Dmitry Kuzmenko	dad748f57a	Data cache plugin configuration documentation.	2016-12-20 19:32:48 +03:00
David Boucha	11863a4bfe	add examples of default minion returners	2016-12-19 13:47:40 -07:00
rallytime	5940db5b3f	Merge branch '2016.3' into '2016.11' ... No conflict.	2016-12-16 15:25:08 -07:00
rallytime	4a62d01577	Add docs for syndic_wait setting ... Fixes #38174	2016-12-15 10:40:01 -07:00
rallytime	8fd53a4808	Merge branch '2016.3' into '2016.11' ... Conflicts: - doc/topics/cloud/vsphere.rst - salt/config/__init__.py - salt/daemons/masterapi.py - salt/templates/rh_ip/network.jinja - salt/utils/parsers.py - tests/unit/daemons_test.py	2016-12-02 12:18:18 -07:00
Denys Havrysh	7d9bc9abce	syndic_master: correct default value, documentation and example config	2016-11-30 17:18:44 +02:00
Dmitry Kuzmenko	0c607ccaec	An example configuration for TLS/SSL. (#37859)	2016-11-23 09:38:16 -07:00
Denys Havrysh	83d6a44254	Add ssh_log_file option to master config and documentation	2016-11-20 16:13:55 +02:00
Denys Havrysh	c8a0915460	Fix configuration example and documentation for syndic_log_file option	2016-11-19 13:11:36 +02:00
rallytime	6332da5c44	Prep release notes for 2016.11	2016-10-31 13:05:24 -06:00
rallytime	112903ad7e	Merge branch '2016.3' into 'carbon' ... Conflicts: - conf/master - doc/ref/configuration/master.rst - salt/cli/daemons.py - salt/client/ssh/__init__.py - salt/config/__init__.py - salt/modules/archive.py - salt/modules/cmdmod.py - tests/unit/states/service_test.py	2016-09-29 09:56:43 -06:00
rallytime	da574e5b03	Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/client/ssh/__init__.py - salt/config/__init__.py - salt/runners/thin.py	2016-09-28 09:01:24 -06:00
Bo Maryniuk	3bfb17ee62	Add a description of the thin/min parameters to the master config	2016-09-27 11:06:43 +02:00
rallytime	d5bbd91c14	Merge branch '2016.3' into 'carbon' ... Conflicts: - conf/master	2016-09-23 17:01:17 -06:00
Nicole Thomas	5548ed771d	Back-port #36435 to 2016.3 (#36532) ... * Added "none" option for pillar_source_merging_strategy * added none to merging strategy in dictupdate so we no longer log warnings when it is selected * Updated documentation * fix for when pillar_source_merging_strategy is not set * Fix looking up pillar data when merging is set to "none" and no saltenv was passed * Fix looking up pillar data when merging is set to "none" and no saltenv was passed retry * Let's not break when no merging strategy is passed * Capitalisation * Update on doc	2016-09-23 13:36:23 -06:00
rallytime	7f955bda0a	Merge branch '2015.8' into '2016.3' ... Conflicts: - tests/unit/modules/boto_vpc_test.py - tests/unit/modules/mount_test.py - tests/unit/modules/puppet_test.py	2016-09-08 10:55:57 -06:00
Nicole Thomas	7cdbc546f1	Back-port #36062 to 2015.8 (#36118) ... * Comment all lines in the minion config file * Add unit tests to check for all files in conf/ to be commented out * Make sure cont/cloud.profiles file is commented out Matches the cloud.providers file format and other sample config files. * Add unit tests for sample files in cloud.profiles.d, cloud.providers.d, and cloud.maps.d * Make sure all sample config files in cloud.maps.d are commented out * Make sure all sample config files in cloud.profiles.d are commented out	2016-09-07 16:01:34 -06:00
Mike Place	4e609a2962	Merge pull request #36062 from rallytime/fix-36045 ... Add test to catch sample config files that are not commented out	2016-09-07 10:30:30 +09:00
rallytime	f1f1b84611	Make sure all sample config files in cloud.profiles.d are commented out	2016-09-05 19:20:33 -06:00
rallytime	832af68bad	Make sure all sample config files in cloud.maps.d are commented out	2016-09-05 19:12:27 -06:00
rallytime	14907e15d3	Make sure cont/cloud.profiles file is commented out ... Matches the cloud.providers file format and other sample config files.	2016-09-05 18:13:02 -06:00
rallytime	9828a0dbfa	Comment all lines in the minion config file	2016-09-05 17:30:59 -06:00
Erik Johnson	6f8984630d	Change default for runner_returns to True	2016-09-03 14:59:04 -05:00
C. R. Oldham	908234d9ab	Document module whitelisting. Remove FIXME comments for disable_modules and disable_returners as they are definitely implemented. (#35717)	2016-09-01 09:40:36 -06:00
rallytime	82e9cb748f	Merge branch '2016.3' into 'develop' ... Conflicts: - salt/client/mixins.py - salt/engines/sqs_events.py - salt/minion.py	2016-08-29 12:48:43 -06:00
Nicole Thomas	96792663da	Add engines to list of extension module options in master config docs (#35864) ... Fixes #35837	2016-08-29 12:22:30 -06:00
Nicole Thomas	f7f8221169	Everything in the sample master config file should be commented out (#35611)	2016-08-19 16:05:40 -06:00
Mike Place	69b44bc6f8	Merge pull request #35500 from rallytime/fix-35068 ... Add docs for pillar_raise_on_missing option	2016-08-17 18:15:29 +09:00
rallytime	cface344d6	Add docs for pillar_raise_on_missing option ... Fixes #35068	2016-08-16 14:57:58 -06:00
rallytime	de4b33f2e1	Merge branch '2016.3' into 'develop' ... Conflicts: - salt/client/ssh/__init__.py - salt/client/ssh/shell.py - salt/config/__init__.py - salt/grains/core.py - salt/utils/gitfs.py	2016-08-08 12:34:23 -06:00
Jeffrey 'jf' Lim	c61c8a27e5	Update instructions for getting master fingerprint in conf/minion	2016-08-06 23:59:58 +08:00
C. R. Oldham	84cc7d67c0	Add documentation for append_minionid_config_dirs.	2016-08-03 12:36:37 -06:00