4012 Commits

Author	SHA1	Message	Date
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
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
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 Jackson	2512a0841d	Add LazyLoader and Singleton auth to 2015.2 release notes	2015-03-23 11:42:48 -07:00
Colton Myers	2b1f400ab4	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/topology/syndic.rst salt/client/__init__.py salt/daemons/masterapi.py salt/minion.py salt/modules/dockerio.py	2015-03-19 16:03:29 -06:00
rallytime	f56cdd5489	Update syndic documentation ... Add some docs about installing a minion on the syndic to help reduce the amount of time spent waiting for the CLI to return.	2015-03-18 16:05:07 -06:00
Colton Myers	a983f1b611	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: salt/modules/win_ntp.py salt/templates/rh_ip/rh5_eth.jinja salt/templates/rh_ip/rh6_eth.jinja setup.py	2015-03-13 17:02:19 -06:00
rallytime	01c8f94b31	Add minimum version dependency for linode-python in docs ... And warn users of older versions leaking sensitive information into the debug logs.	2015-03-13 11:53:02 -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
jfindlay	5b4972b55d	Merge pull request #21574 from rallytime/full_version ... Use the full version for a versionadded tag	2015-03-11 17:50:23 -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
Mike Place	87bd28b8cb	Note the issue number	2015-03-11 12:19:51 -06:00
Mike Place	9d5da3b878	Note the change in release notes	2015-03-11 12:19:51 -06:00
Thomas S Hatch	0eb66a36cb	Merge pull request #21162 from cro/linode-python-driver2 ... Update linode salt-cloud driver to support using either linode-python or apache-libcloud	2015-03-11 11:45:15 -06:00
Seth House	049975a1ca	Added versionadded for ext_pillar_first	2015-03-11 11:53:59 -04:00
Mike Place	eef62c762d	Merge pull request #21492 from cachedout/tcp_doc ... Note the change to TCP keepalives in release notes	2015-03-10 10:12:13 -06:00
Mike Place	393cf9c13a	Note the change to tcp keepalives in release notes	2015-03-10 10:45:16 -06:00
Jacob Hammons	921d679065	Regenerated and updated man pages, updated release version in conf.py to 2014.7.2	2015-03-10 09:22:57 -06:00
Jacob Hammons	767a3c378d	Updated man pages, updated copyright year in conf.py	2015-03-09 18:36:38 -06:00
Thomas S Hatch	d16aa59c6d	Merge pull request #21379 from jacksontj/2015.2 ... 2015.2: Add raw bool support to decorators	2015-03-09 10:46:08 -06:00