4071 Commits

Author	SHA1	Message	Date
C. R. Oldham	63fafe961e	Clarify the nature of auth and start events.	2015-04-24 12:46:32 -06:00
Colton Myers	a18e017619	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/man/salt.1 doc/ref/cli/salt.rst	2015-04-24 10:07:48 -06:00
Justin	8486e17ab3	Added retry_dns to minion doc.	2015-04-23 15:33:59 -06:00
Jonathan Ballet	19efd419b5	Improve state_output documentation ... List all the available settings in the documentation and on the command line. Also, make the documentation clearer about the different possibilities.	2015-04-23 10:22:11 +02:00
Thomas S Hatch	022a43aaa9	Merge pull request #22904 from jacobhammons/2015.2 ... Regenerated man pages	2015-04-21 12:51:48 -06:00
Jacob Hammons	99abfd7755	Regenerated man pages	2015-04-21 11:33:30 -06:00
Jacob Hammons	32ef5ca397	Revert "Regenerated man pages" ... This reverts commit 069a0cac71.	2015-04-21 11:27:31 -06:00
Jacob Hammons	069a0cac71	Regenerated man pages	2015-04-21 11:20:52 -06:00
Colton Myers	92c51affc5	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-21 10:33:39 -06:00
Pedro Algarvio	95d6887949	Don't fail on make clean just because the directory does not exist	2015-04-21 00:46:09 +01: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
Thomas S Hatch	b6e803910f	Merge pull request #22753 from thatch45/doc_clear ... fix some bad sls data in a doc	2015-04-16 11:58:17 -06:00
Thomas S Hatch	b20dbb822b	fix some bad sls data in a doc	2015-04-16 11:49:35 -06:00
Colton Myers	ccfcedbf6b	Go back to the 2015.2 version of salt.7	2015-04-16 11:46:30 -06:00
Colton Myers	8d9874a78a	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-16 10:37:38 -06:00
Justin Findlay	3a5a60b5a7	Merge pull request #22688 from msteed/issue-22676 ... Add missing command line options to man pages	2015-04-14 23:17:47 -06:00
Michael Steed	70f1ca9ea5	Add missing command line options to man pages ... Refs #22676	2015-04-14 17:32:56 -06:00
Jacob Hammons	6e416fc300	Regenerated salt-call and salt.7 man pages Refs #22239	2015-04-14 13:56:31 -06:00
Michael Steed	5efb284c22	Update salt-call manpage to match cli help text ... refs #22239	2015-04-14 11:52:55 -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
Corin Kochenower	911345dd1a	Add versionadded label for event_return	2015-04-07 14:15:03 -06:00
Thomas S Hatch	817d7679f4	Merge pull request #22418 from basepi/merge-forward-2015.2 ... [2015.2] Merge forward from 2014.7 to 2015.2	2015-04-07 11:00:32 -06:00
Thomas S Hatch	9808332e8b	Merge pull request #22417 from whiteinge/doc-sshclient ... Add SSHClient to the Python API docs	2015-04-07 10:45:13 -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
Seth House	30ad8d99df	Add SSHClient to the Python API docs ... I'm leaving cmd_sync out on purpose for now until we get eauth support sorted.	2015-04-07 09:53:02 -06:00
Thomas S Hatch	393ee4c87d	Merge pull request #22390 from cro/pyshtrue_unless_onlyif ... Allow unless, onlyif, check_cmd to use python_shell=True	2015-04-07 09:15:11 -06:00
Kevin Bowling	f324d38f8c	2015.2 relnotes edits	2015-04-06 14:36:51 -07:00
C. R. Oldham	977d9accf0	Allow unless, onlyif, check_cmd to use python_shell=True	2015-04-06 14:20:08 -06:00
C. R. Oldham	06d761671a	Add authentication against Active Directory	2015-04-03 17:26:59 -06:00