4032 Commits

Author	SHA1	Message	Date
Colton Myers	5f1a4b45b8	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-08 10:38:34 -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
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
Seth House	fbfbde5bde	Added autodoc placeholders for the new modules	2015-04-03 12:31:57 -06:00
Seth House	92e0338a59	Updated beacon, roster, runners module indexes with new additions	2015-04-03 12:27:11 -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
jfindlay	d5a61388c4	Merge pull request #22099 from cro/bp-21101 ... Backport #21101 to 2015.2	2015-03-28 11:33:17 -06:00
Mike Place	ef942ce3c8	Document becaon intervals	2015-03-27 16:38:36 -06:00
Jacob Hammons	7cb6c8fdcb	Updated salt man page	2015-03-27 12:15:49 -06:00
Seth House	fa3d1c3ad4	Added runner module for working with sdb ... This is literally a copy of the execution module.	2015-03-26 18:34:53 -04: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
Seth House	8e203c4a0a	Added the etcd sdb module to the module index	2015-03-26 11:52:21 -04: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
Nicole Thomas	e7c7608ae2	Merge pull request #22018 from whiteinge/doc-sdb-modules-index ... Add sdb modules to the module index	2015-03-25 16:36:50 -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
Seth House	264c08841e	Added generated .rst files for the various sdb modules	2015-03-25 17:11:20 -04:00
Seth House	c2af83ea3e	Added sdb modules to the module index	2015-03-25 17:08:19 -04:00
Thomas S Hatch	c58fe8bc07	Update release notes back to Jan 29th	2015-03-25 13:23:38 -06:00
C. R. Oldham	2eb6d26995	Add authentication against Active Directory	2015-03-25 13:01:37 -06:00
C. R. Oldham	7421042dd2	Add authentication against Active Directory	2015-03-25 12:49:35 -06:00
Colton Myers	7ba2404cc9	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: conf/master conf/minion doc/ref/configuration/master.rst salt/loader.py salt/minion.py salt/modules/ssh.py salt/output/nested.py salt/utils/network.py	2015-03-25 09:28:04 -06:00
Nicole Thomas	cda629d531	Merge pull request #21963 from cachedout/2014_7_3_changes ... Release note changes	2015-03-24 17:32:24 -06:00
Mike Place	2639f4b566	Release note changes	2015-03-24 17:02:18 -06:00
Thomas S Hatch	afcf1d7b27	Merge pull request #21955 from rallytime/update_master_conf_doc ... Add default for pillar_source_merging_strategy in conf/master file	2015-03-24 16:45:40 -06:00
Mike Place	53846aa284	Merge pull request #21958 from cachedout/2015_2_mm_note ... Add known multimaster issue to 2015.2 notes	2015-03-24 15:50:16 -06:00
Mike Place	98642d7b87	Add known multimaster issue to 2015.2 notes	2015-03-24 15:49:58 -06:00
Mike Place	e6d70629df	2014.7.3 release notes	2015-03-24 15:48:05 -06:00
rallytime	73a0df18a8	There are 4 values, not 3.	2015-03-24 14:57:29 -06:00