1250 Commits

Author	SHA1	Message	Date
Colton Myers	fd09cdae6f	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/ssh/roster.rst salt/client/ssh/__init__.py salt/client/ssh/wrapper/__init__.py salt/config.py salt/modules/file.py salt/runners/lxc.py	2015-05-05 16:26:39 -06:00
Colton Myers	cb69cd07de	Match the master config template in the master config reference	2015-05-04 15:05:21 -06:00
Colton Myers	91dd9dcbdc	Add ssh_minion_opts to master config ref	2015-05-04 15:00:28 -06:00
Steve Weber	97513b060a	include module_dirs ... include module_dirs	2015-05-04 13:00:31 -04: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	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	8d9874a78a	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-16 10:37:38 -06:00
Michael Steed	70f1ca9ea5	Add missing command line options to man pages ... Refs #22676	2015-04-14 17:32:56 -06:00
Michael Steed	5efb284c22	Update salt-call manpage to match cli help text ... refs #22239	2015-04-14 11:52:55 -06:00
Thayne Harbaugh	6179839225	Improve documentation for nested nodegroup.	2015-04-09 01:43:18 -06:00
Corin Kochenower	911345dd1a	Add versionadded label for event_return	2015-04-07 14:15:03 -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
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
C. R. Oldham	977d9accf0	Allow unless, onlyif, check_cmd to use python_shell=True	2015-04-06 14:20:08 -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	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
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
Seth House	8e203c4a0a	Added the etcd sdb module to the module index	2015-03-26 11:52:21 -04: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
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
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
rallytime	73a0df18a8	There are 4 values, not 3.	2015-03-24 14:57:29 -06:00
rallytime	c98118eb55	Update pillar_source_merging_strategy config doc spacing ... to match accross all config values	2015-03-24 14:56:09 -06:00
Thomas S Hatch	cc9d294fcd	Merge pull request #21569 from basepi/merge-forward-2015.2 ... Merge forward from 2014.7 to 2015.2	2015-03-12 13:36:39 -06:00
rallytime	0171f68600	Use the full version for a versionadded tag	2015-03-11 16:29:08 -06:00
Colton Myers	ebe7eeafd9	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/conf.py doc/man/salt-api.1 doc/man/salt-call.1 doc/man/salt-cloud.1 doc/man/salt-cp.1 doc/man/salt-key.1 doc/man/salt-master.1 doc/man/salt-minion.1 doc/man/salt-run.1 doc/man/salt-ssh.1 doc/man/salt-syndic.1 doc/man/salt-unity.1 doc/man/salt.1 doc/man/salt.7 salt/cloud/clouds/linode.py salt/states/composer.py salt/states/win_update.py	2015-03-11 15:14:56 -06:00
Elias Probst	bc9a30b7e9	Typo (rendered → renderer)	2015-03-11 21:15:32 +01:00
Seth House	049975a1ca	Added versionadded for ext_pillar_first	2015-03-11 11:53:59 -04:00
Thomas Jackson	b8e39c13f9	Add docs for new raw boolean support of depends decorator	2015-03-05 22:02:34 -08:00
Seth House	57b1f67daa	Added autosummary generated placeholders for the new module docs	2015-03-02 14:07:18 -07:00
Seth House	1382401618	Updated all the module index pages with the latest/newest modules	2015-03-02 13:59:19 -07:00
C. R. Oldham	00942f2060	Merge forward 2014.7->2015.2	2015-03-01 17:55:25 -07:00
Seth House	4d974d9676	Improved presence docs; added cross-references and localhost caveat ... Closes #18436.	2015-02-28 19:22:38 -07:00
C. R. Oldham	c9610bc4f2	Merge commit, merge forward 2014.7 to 2015.2	2015-02-27 15:01:30 -07:00
Erik Johnson	4ce8a9d064	Improve salt fileserver documentation	2015-02-27 14:53:57 -07:00
Erik Johnson	a7ba699ad7	remove grains outputter from autosummary	2015-02-27 18:12:18 +01:00
Erik Johnson	abf00abea4	remove the docs' .rst file for deleted grains outputter ... See e1f8ea6.	2015-02-27 18:12:18 +01:00
Erik Johnson	db85cd43f7	Improve salt fileserver documentation	2015-02-24 22:37:30 -06:00
Erik Johnson	93835d3f4e	Hide set_pass from lxc state docs	2015-02-10 15:06:46 -06:00
rallytime	c65d9673a7	Merge branch '2014.7' into merge_forward_fifteen_second_try ... Conflicts: salt/states/file.py	2015-01-29 13:42:49 -07:00
Seth House	e3d29bf8ff	Fixed syntax error in log_granular_levels example	2015-01-27 20:14:53 -07:00
Seth House	a26aef0d7d	Added beacon module docs to the module index	2015-01-26 18:19:34 -07:00
Erik Johnson	175ba127be	Merge branch '2014.7' into 2014.7-2015.2 ... Conflicts: salt/modules/archive.py	2015-01-14 14:26:22 -06:00