2246 Commits

Author	SHA1	Message	Date
Seth House	35c91881ab	Added note about debugging reactor files to see the rendered output	2015-04-28 14:48:38 -06:00
Colton Myers	a8f797e0e4	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-28 09:48:53 -06:00
rallytime	f6cc7c8f8a	Adjust ZeroMQ 4 docs to reflect changes to Ubuntu 12 packages ... Removed the chrislea ppa third party installation information. This shouldn't be needed anymore for any Ubuntu package after 2014.7.5.	2015-04-27 15:57:41 -06:00
C. R. Oldham	63fafe961e	Clarify the nature of auth and start events.	2015-04-24 12:46:32 -06:00
Colton Myers	1f9934c634	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/installation/windows.rst doc/topics/tutorials/gitfs.rst	2015-04-20 11:39:41 -06:00
Justin Findlay	900c7a510f	Merge pull request #22800 from terminalmage/issue21979 ... Improve error logging for pygit2 SSH-based remotes	2015-04-18 11:18:55 -06:00
Justin Findlay	e99f2fdb28	Merge pull request #22813 from twangboy/win_doc_fix ... Updated instructions for building salt	2015-04-17 22:10:07 -06:00
twangboy	adc421acdd	Fixed some formatting issues	2015-04-17 15:03:47 -06:00
twangboy	8901b3b5a6	Updated instructions for building salt	2015-04-17 14:41:46 -06:00
rallytime	5931a582d1	Replace all 4s with 5s	2015-04-17 14:15:33 -06:00
rallytime	eadaead755	Add 2014.7.5 links to windows installation docs	2015-04-17 14:13:40 -06:00
Erik Johnson	98885f71d6	Add information about libssh2 requirement for pygit2 ssh auth	2015-04-17 13:24:14 -05:00
rallytime	fde1feed46	Remove extra line	2015-04-17 11:42:14 -06:00
rallytime	b19b95d992	Added release note for 2014.7.5 release	2015-04-17 11:41:07 -06:00
Colton Myers	9099884809	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/cloud/config.rst salt/modules/win_disk.py salt/modules/yumpkg.py salt/pillar/s3.py salt/states/service.py salt/utils/event.py tests/integration/netapi/rest_tornado/test_app.py tests/integration/netapi/test_client.py tests/unit/states/archive_test.py	2015-04-14 11:03:03 -06:00
Corin Kochenower	60b48ce1c0	Simple textual change	2015-04-14 08:54:34 -06:00
rallytime	fb03af37d3	Add note about missing state internal keyword arguments to release notes	2015-04-13 15:29:55 -06:00
rallytime	9eb273f097	Add batch matching bug note to known issues in 2014.7.4 release notes	2015-04-13 13:35:48 -06:00
Thomas S Hatch	fbf35f94ab	Merge pull request #22491 from plastikos/improvement-nested_nodegroups ... improvement: Support nested nodegroups	2015-04-10 09:17:27 -06:00
shanedlee	c874ca8c20	Added additional details regarding windows implementation	2015-04-09 11:32:13 -04:00
Thayne Harbaugh	6179839225	Improve documentation for nested nodegroup.	2015-04-09 01:43:18 -06:00
Joseph Hall	aa23eb0e26	Merge pull request #22448 from rallytime/migrate_old_cloud_config_docs ... Migrate old cloud config documentation to own page	2015-04-08 12:32:35 -06:00
Colton Myers	5f1a4b45b8	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-08 10:38:34 -06:00
rallytime	cecca10668	Kill legacy cloud configuration syntax docs per techhat	2015-04-07 20:09:37 -06:00
rallytime	52a3d500e8	Beef up cloud configuration syntax and add pillar config back in	2015-04-07 18:56:40 -06:00
rallytime	9b5318fe71	Move old cloud syntax to "Legacy" cloud config doc	2015-04-07 18:41:21 -06:00
rallytime	7a9ce92dd9	Add docs explaing file_map upload functionality ... Fixes #16886	2015-04-07 17:23:02 -06:00
Colton Myers	25f9b2d2d1	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/cloud/action.rst doc/topics/cloud/function.rst doc/topics/reactor/index.rst	2015-04-07 10:05:35 -06:00
Kevin Bowling	f324d38f8c	2015.2 relnotes edits	2015-04-06 14:36:51 -07:00
C. R. Oldham	06d761671a	Add authentication against Active Directory	2015-04-03 17:26:59 -06:00
C. R. Oldham	ade043070d	Add authentication against Active Directory	2015-04-03 17:26:59 -06:00
rallytime	eac4c63990	Add list_node docs to Cloud Function page	2015-04-03 16:30:58 -06:00
rallytime	bf31daa82e	Add Feature Matrix link to cloud action and function pages	2015-04-03 16:15:50 -06:00
rallytime	d5fa02d566	Add list_node* functions to feature matrix	2015-04-03 15:59:16 -06:00
Thomas S Hatch	4281cd67fa	Merge pull request #22300 from rallytime/windows_release_docs ... Add windows package installers to docs	2015-04-02 17:45:38 -06:00
Seth House	a8bdc17bbf	Better explanations and more examples of how the Reactor calls functions ... Refs #20841	2015-04-02 17:07:22 -06:00
Thomas S Hatch	d2e4ac840d	Merge pull request #22212 from ckochenower/2015.2 ... Add detail for writing a returner	2015-03-31 15:15:52 -06:00
Corin Kochenower	f44e25715a	Add detail for writing a returner	2015-03-31 13:59:11 -06:00
rallytime	1abaacd868	Add windows package installers to docs	2015-03-30 16:10:10 -06:00
Mike Place	ef942ce3c8	Document becaon intervals	2015-03-27 16:38:36 -06:00
Nicole Thomas	f38b67b687	Merge pull request #22041 from basepi/merge-forward-2015.2 ... [2015.2] Merge forward from 2014.7 to 2015.2	2015-03-26 10:30:21 -06:00
Colton Myers	afeb4743a1	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-03-26 09:45:55 -06:00
Mike Place	6fb70ea874	Add etcd sdb to 2015.2 release notes	2015-03-26 09:13:28 -06:00
Colton Myers	74dcd7df1c	Add 2014.7.4 release notes	2015-03-26 09:03:35 -06:00
jfindlay	30013cd79e	Merge pull request #22027 from jfindlay/notes ... edited 2015.2.0 release notes	2015-03-26 07:49:23 -06:00
Justin Findlay	7ac7b74621	add release note about reactor users for runners	2015-03-25 21:14:10 -06:00
Justin Findlay	9b1e3f7a2a	wrap at 80 chars	2015-03-25 21:12:51 -06:00
Justin Findlay	88add58cef	misc cachedout edits	2015-03-25 21:10:48 -06:00
Mike Place	b0bd0b7aeb	Merge pull request #22005 from cro/eauth_activedirectory ... Add ability to eAuth against Active Directory	2015-03-25 15:41:56 -06:00
Thomas S Hatch	c58fe8bc07	Update release notes back to Jan 29th	2015-03-25 13:23:38 -06:00