7464 Commits

Author	SHA1	Message	Date
rallytime	2337904656	Add updated release notes to 2017.7.2 branch	2017-10-02 17:18:30 -04:00
Erik Johnson	b5f10696c2	Improve the reactor documentation ... This reorganizes the reactor docs and includes examples of the new reactor SLS config syntax.	2017-09-18 16:07:36 -04:00
Erik Johnson	7a2f12b96a	Include a better example for reactor in master conf file	2017-09-18 16:07:36 -04:00
Damon Atkins	b3dbafb035	Update doco	2017-09-14 12:28:23 -04:00
rallytime	d40eba6b37	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/states/git.py	2017-08-25 16:07:27 -04:00
Ch3LL	1b24244bd3	Add New Release Branch Strategy to Contribution Docs	2017-08-24 12:51:00 -04: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
rallytime	8a0f948e4a	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/utils/versions.py - tests/unit/modules/test_boto_elb.py - tests/unit/modules/test_boto_secgroup.py - tests/unit/states/test_boto_vpc.py	2017-08-17 09:10:31 -04:00
rallytime	566ba4fe76	Merge branch '2016.3' into '2016.11' ... Conflicts: - doc/conf.py	2017-08-17 09:03:44 -04:00
Denys Havrysh	44ed53b1df	[DOCS] Fix link to Salt Cloud Feature Matrix	2017-08-16 10:26:45 +03:00
Ch3LL	cbecf65823	[2017.7] Bump latest and previous versions	2017-08-15 12:55:02 -04:00
Ch3LL	74e7055d54	[2016.11] Bump latest and previous versions	2017-08-15 12:54:12 -04:00
Ch3LL	b551e66744	[2016.3] Bump latest and previous versions	2017-08-15 12:53:16 -04:00
Ch3LL	1d8f827c58	Add Security Notice to 2017.7.1 Release Notes	2017-08-15 12:37:50 -04:00
Ch3LL	a6f902db40	Add Security Notice to 2016.11.77 Release Notes	2017-08-15 12:35:37 -04:00
Ch3LL	d75d3741f8	Add Security Notice to 2016.3.7 Release Notes	2017-08-15 12:33:27 -04:00
amalleo25	4e46c968e6	Update joyent.rst ... Missing colon in example cloud.profiles.d config file.	2017-08-14 14:35:50 -04:00
Dmitry Kuzmenko	afedd3b654	Typos and version fixes in the doc.	2017-08-14 18:08:40 +03:00
Nicole Thomas	c6ca7d639f	Merge pull request #42889 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2017-08-14 10:16:19 -04:00
Mircea Ulinic	93be79a135	Index eos under the installation instructions list	2017-08-12 23:15:11 +01:00
Mircea Ulinic	f903e7bc39	Minor eos doc correction	2017-08-12 23:11:25 +01: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
Nicole Thomas	3b9c3c5671	Merge pull request #42886 from sarcasticadmin/adding_docs_salt_outputs ... Adding missing output flags to salt cli docs	2017-08-11 14:35:18 -04:00
Nicole Thomas	459fdedc67	Merge pull request #42678 from frankiexyz/2017.7 ... Add eos.rst in the installation guide	2017-08-11 09:58:36 -04:00
Erik Johnson	35e05c9515	Add note about git CLI requirement for GitPython to GitFS tutorial	2017-08-10 16:47:47 -05:00
Robert James Hernandez	744bf954ff	Adding missing output flags to salt cli	2017-08-10 13:19:08 -07:00
rallytime	08bbcf5790	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/win_pkg.py	2017-08-10 14:51:27 -04: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
Ch3LL	90a2fb66a2	Fix typo for template_dict in http docs	2017-08-07 16:45:42 -04:00
Daniel Wallace	bca17902f5	add version added info	2017-08-03 09:01:34 -06:00
Daniel Wallace	4bbfc751ae	render kubernetes docs	2017-08-03 09:01:34 -06:00
Frankie Hui	1598571f52	Add eos.rst in the installation guide	2017-08-02 17:47:31 +08: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
Nicole Thomas	e2dd443002	Merge pull request #42601 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2017-07-27 16:32:06 -06:00
Nicole Thomas	22eea389fa	Merge pull request #42290 from isbm/isbm-module_run_parambug_42270_217 ... Backport of #42270	2017-07-27 16:30:05 -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
Mike Place	535c922511	Merge pull request #42523 from rallytime/fix-42375 ... Add a mention of the True/False returns with __virtual__()	2017-07-27 13:13:06 -05:00
rallytime	46715e9d94	Merge branch '2017.7.1' into '2017.7' ... Conflicts: - doc/topics/releases/2017.7.1.rst	2017-07-26 14:29:24 -06:00
rallytime	7bcaa5a4cc	small markup fix for title	2017-07-26 09:00:45 -06:00
Ch3LL	d066b599ca	add changelog to 2017.7.1 release notes	2017-07-26 09:00:34 -06:00
Ch3LL	fb69e71093	add changelog to 2017.7.1 release notes	2017-07-25 21:10:58 -04:00
rallytime	685c2cced6	Add information about returning a tuple with an error message	2017-07-25 14:44:18 -06:00