2264 Commits

Author	SHA1	Message	Date
rallytime	9db4179462	Merge branch '2016.11' into '2017.7' ... Conflicts: - tests/unit/grains/test_core.py	2017-12-12 15:24:30 -05:00
rallytime	239f3511bf	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/reg.py - salt/modules/state.py - salt/modules/win_pkg.py - salt/netapi/rest_cherrypy/app.py - salt/utils/__init__.py - tests/integration/modules/test_file.py - tests/integration/output/test_output.py - tests/unit/grains/test_core.py	2017-12-01 11:12:44 -05:00
chris ruscio	e2682bf441	Fix minion ping_interval documentation	2017-11-30 13:56:10 -05:00
Gareth J. Greenaway	998d714ee7	Merge pull request #44517 from whytewolf/publish_port_doc_missing ... Publish port doc missing	2017-11-28 13:50:18 -08:00
rallytime	90d1cb221d	Add documentation about logging before modules are loaded	2017-11-20 09:05:49 -05:00
Thomas Phipps	4b5855283a	missed one place where i didnt chanbge master_port from my copy to publish_port	2017-11-13 12:21:34 -07:00
Thomas Phipps	e4610baea5	update doc to have publish port	2017-11-13 12:14:13 -07:00
Thomas Phipps	9cdeb4e903	update log-granular-levels to describe what they are filtering on	2017-11-08 16:11:46 -08:00
rallytime	edbbd5fc2b	Merge branch '2016.11' into '2017.7' ... Conflicts: - .kitchen.yml - salt/modules/win_system.py	2017-11-05 20:56:44 -07:00
Rossen Georgiev	b18f2e5a6d	fix program name and description for --static	2017-10-30 15:10:11 +00:00
Rossen Georgiev	5b10918f02	updated CLI docs for salt-ssh	2017-10-28 10:54:47 +01:00
Nicole Thomas	6252f82f58	Merge pull request #44133 from cachedout/fix_paralell_docs ... Fix typos in parallel states docs	2017-10-17 11:24:18 -04:00
Mike Place	8d1c1e21f0	Fix typos in paralell states docs	2017-10-16 16:43:10 -06:00
rallytime	bbec47afbc	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/utils/aws.py	2017-10-16 08:57:50 -04:00
David A. Pocock	266dc00a23	Typo correction of lover to lower	2017-10-10 15:04:00 -05:00
Mike Place	3a79549af4	Merge pull request #43467 from DSRCorporation/bugs/43124_users_regex ... Bugs/43124 users regex	2017-09-22 13:21:08 -06:00
rallytime	fca4e5563a	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/win_pkg.py - tests/unit/utils/test_parsers.py	2017-09-22 09:40:03 -04:00
Mike Place	365cb9fba8	Merge pull request #43677 from terminalmage/runners-docs-2016.11 ... Fix RST headers for runners (2016.11 branch)	2017-09-21 10:35:56 -06:00
Erik Johnson	c0a79c70a4	Fix RST headers for runners (2017.7 branch) ... To conform with the rest of the rst files for runner docs, they should only contain the module name.	2017-09-21 10:27:12 -05:00
Erik Johnson	2fd88e94fa	Fix RST headers for runners (2016.11 branch) ... To conform with the rest of the rst files for runner docs, they should only contain the module name.	2017-09-21 10:11:28 -05:00
Silvio Moioli	625eabb83f	multiprocessing minion option: documentation fixes	2017-09-21 10:55:52 +02:00
Mike Place	56b671e087	Merge pull request #43330 from terminalmage/issue43077 ... Fix reactor regression + unify reactor config schema	2017-09-18 10:46:10 -06:00
Dmitry Kuzmenko	14bf2dd8ff	Support regex in publisher_acl.	2017-09-18 18:38:44 +03:00
haam3r	58f7d051c9	Issue #43479 No runners.config in 2017.7 branch ... Add extra note about needing to import the runners.config module from the develop branch when running on a 2017.7 release.	2017-09-14 23:01:53 +03:00
Erik Johnson	20f6f3cc39	Include a better example for reactor in master conf file	2017-09-13 10:35:23 -05:00
Mike Place	5378ac7756	Merge pull request #41547 from cloudflare/px_merge_pillar_opts ... Override proxy minion opts with pillar data	2017-09-11 15:47:50 -06:00
rallytime	ef7b4242c3	Merge branch '2016.11' into '2017.7' ... No conflicts.	2017-09-11 12:24:10 -04:00
Mircea Ulinic	aad39ba665	Document the new opts	2017-09-04 14:17:14 +00:00
Ken Jordan	ba0cdd4536	Fix phrasing for mine_interval description	2017-09-01 15:13:20 -06:00
Ken Jordan	9ff03c2d43	Update Salt Mine documentation to show that the mine_interval option is configured in minutes.	2017-09-01 14:57:10 -06:00
rallytime	bcbe180fbc	Merge branch '2016.11' into '2017.7' ... No conflicts.	2017-08-23 10:08:09 -04:00
Denys Havrysh	af743ff6c3	[DOCS] Add missing utils sub-dir listed for extension_modules	2017-08-22 12:18:42 +03:00
rallytime	84829a6f8c	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/jenkins.py - salt/states/jenkins.py	2017-08-18 09:13:54 -04:00
garethgreenaway	51d16840bb	Merge pull request #42890 from DSRCorporation/bugs/42627_salt-cp ... Make chunked mode in salt-cp optional	2017-08-17 11:37:43 -07:00
Dmitry Kuzmenko	cfddbf1c75	Apply code review: update the doc	2017-08-17 16:47:45 +03:00
Dmitry Kuzmenko	afedd3b654	Typos and version fixes in the doc.	2017-08-14 18:08:40 +03:00
Dmitry Kuzmenko	999388680c	Make chunked mode in salt-cp optional (disabled by default). ... This reverts breaking of backward compatibility related to the cp.recv interface change.	2017-08-11 22:44:42 +03:00
rallytime	29ff19c587	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/config/__init__.py - salt/states/dockerng.py - salt/utils/cloud.py	2017-08-11 15:17:19 -04:00
Robert James Hernandez	744bf954ff	Adding missing output flags to salt cli	2017-08-10 13:19:08 -07:00
rallytime	152eb88d9f	Update modules --> states in kubernetes doc module ... The kubernetes state docs are not rendering/building due to a typo in the doc module. Fixes #42639	2017-08-08 14:42:34 -04:00
Daniel Wallace	4bbfc751ae	render kubernetes docs	2017-08-03 09:01:34 -06:00
Mike Place	fb81e78f71	Merge pull request #42603 from twangboy/win_fix_runas ... Add runas_passwd as a global for states	2017-07-31 14:49:48 -05:00
twangboy	464ec34713	Fix another instance of runas_passwd	2017-07-28 11:20:48 -06:00
twangboy	4ea264e3db	Change to runas_password in docs	2017-07-28 10:16:38 -06:00
twangboy	b9c91eba60	Add runas_passwd as a global for states	2017-07-27 15:46:58 -06:00
rallytime	36a1bcf8c5	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/win_wua.py - salt/utils/schedule.py - tests/unit/modules/rabbitmq_test.py	2017-07-27 14:00:15 -06:00
rallytime	685c2cced6	Add information about returning a tuple with an error message	2017-07-25 14:44:18 -06:00
rallytime	fa466519c4	Add a mention of the True/False returns with __virtual__() ... And their relationship to `__virtualname__`. Fixes #42375	2017-07-24 13:58:16 -06:00
rallytime	c673b64583	Merge branch '2016.11' into '2017.7' ... Conflicts: - doc/conf.py - doc/ref/configuration/master.rst - doc/ref/configuration/minion.rst - salt/engines/hipchat.py - salt/engines/slack.py - salt/grains/core.py - salt/version.py - tests/integration/states/test_renderers.py	2017-07-20 09:54:08 -06:00
rallytime	7aa31ff030	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/grains/core.py - salt/modules/git.py - salt/modules/pillar.py - salt/states/saltmod.py - salt/states/user.py - tests/integration/states/handle_iorder.py	2017-07-18 09:05:43 -06:00