3893 Commits

Author	SHA1	Message	Date
Thomas S Hatch	97285aadd0	Merge pull request #20152 from techhat/httpupdate ... Add function to update CA cert bundle	2015-01-28 15:03:55 -07:00
Joseph Hall	f846925ba7	Document text_out and headers_out	2015-01-28 11:08:31 -07:00
Joseph Hall	d1746fa7fe	Document updating CA bundles	2015-01-28 10:51:04 -07:00
rallytime	dc23823897	Merge branch '2014.7' into '2015.2' ... Conflicts: salt/modules/localemod.py	2015-01-27 13:24:14 -07:00
rallytime	80bfa4a2a6	Add beacons section to 2015.2.0 release notes	2015-01-26 20:26:51 -07:00
Seth House	8e476bc455	Fixed typos in the beacon docs	2015-01-26 18:20:54 -07:00
Seth House	b777d3cba1	Added unique identifier for the beacon docs	2015-01-26 18:19:34 -07:00
Seth House	a26aef0d7d	Added beacon module docs to the module index	2015-01-26 18:19:34 -07:00
Seth House	127ddb6d9c	Added cross-references to the inotify beacon module	2015-01-26 18:19:34 -07:00
Thomas S Hatch	5affea1022	Merge branch '2015.2' into beacons	2015-01-26 16:57:43 -07:00
Shane D Lee	7c253f5ede	Changed exe's to installers	2015-01-26 15:48:03 -07:00
Thomas S Hatch	828906d62d	Merge branch '2015.2' into beacons	2015-01-25 09:26:43 -07:00
Thomas S Hatch	54529a9aa2	Add initial documentation	2015-01-23 23:11:34 -07:00
Pedro Algarvio	cdbbe4c0dd	Fix typos	2015-01-24 03:16:52 +00:00
Mike Place	b8e9249c80	Added docs for Lithium deprecations	2015-01-24 03:16:49 +00:00
Colton Myers	9e9a2eab90	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: salt/fileserver/gitfs.py salt/loader.py	2015-01-23 16:13:30 -07:00
Thomas S Hatch	55cb7fdab1	Merge pull request #20015 from basepi/grainsprecedencedocs19611 ... Fix grains precedence issues	2015-01-23 15:40:32 -07:00
Colton Myers	f609366dee	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/conf.py	2015-01-22 16:53:22 -07:00
Colton Myers	f1e7661973	Release 2014.7.1 (docs sidebar and release date for release notes)	2015-01-22 16:52:21 -07:00
Colton Myers	079e20a536	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-01-22 16:48:27 -07:00
Colton Myers	63195007d6	Merge pull request #19980 from rallytime/update_windows_release_docs ... Add 2014.7.1 release to Windows Installation Docs	2015-01-22 16:48:15 -07:00
Colton Myers	c1e630340e	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: salt/fileserver/gitfs.py salt/grains/core.py	2015-01-22 16:46:32 -07:00
robert.fach	4f7b0a29d1	updated information regarding required version for dulwich gitfs backend	2015-01-22 17:14:27 +01:00
Colton Myers	a067e6ceba	Fix the grains precedence documentation ... Fixes #19611	2015-01-21 16:10:18 -07:00
Colton Myers	098c39596a	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: salt/templates/rh_ip/rh5_eth.jinja salt/templates/rh_ip/rh6_eth.jinja salt/utils/templates.py	2015-01-21 11:19:06 -07:00
Thomas S Hatch	678c57f414	Merge pull request #19907 from techhat/httpdocs ... Update HTTP tutorial for new functionality	2015-01-21 10:41:34 -07:00
Joseph Hall	483e84c78a	Update HTTP tutorial for new functionality	2015-01-21 09:20:11 -07:00
Joseph Hall	667473c72c	Modify how joyent driver handles SSL and URLs	2015-01-21 08:29:06 -07:00
Thomas S Hatch	602b1a34aa	Merge pull request #19862 from kev009/freebsd-kmods ... Add freebsdkmod changes to 2014.7.2 relnotes	2015-01-20 16:06:17 -07:00
Colton Myers	88fb2e0036	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/tutorials/starting_states.rst salt/modules/linux_lvm.py	2015-01-20 15:19:53 -07:00
Colton Myers	1fb6fc0ba1	Fix the explanation of the Default Data - YAML section of starting states	2015-01-20 15:03:54 -07:00
rallytime	99e35ffb1e	Add 2014.7.1 release to Windows Installation Docs ... Also remove the links to the 2014.7.0 exe's because of regressions.	2015-01-20 12:21:57 -07:00
Kevin Bowling	494543c5bc	Add freebsdkmod changes to 2014.7.2 relnotes	2015-01-20 02:09:32 -07:00
Colton Myers	d1b201e2bf	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: salt/runners/manage.py salt/utils/cloud.py	2015-01-15 16:20:48 -07:00
Joseph Hall	56a52f9552	Merge pull request #19752 from rallytime/remove_sshpass_checks ... Remove sshpass checks	2015-01-15 15:12:00 -07:00
rallytime	4d5cc90c6a	Remove sshpass checks from utils/cloud.py and other references ... Fixes #19219	2015-01-14 23:08:00 -07:00
Colton Myers	228ada2890	Add release notes for 2014.7.2	2015-01-14 15:17:33 -07:00
Colton Myers	2e364ac249	Add more release notes for 2014.7.1	2015-01-14 15:17:21 -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
rallytime	4a1a5123f2	Remove old --out options from salt-cloud docs ... Fixes #19453	2015-01-13 21:39:27 -07:00
Colton Myers	2a6c9a8165	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/ssh/index.rst	2015-01-13 11:58:58 -07:00
David\ Beitey	839968f637	Expand documentation about Saltfile for salt-ssh	2015-01-13 16:50:29 +10:00
Colton Myers	3ce5eb2838	Merge branch '2014.7' into merge-forward-2015.2 ... Conflicts: salt/modules/archive.py salt/modules/brew.py salt/modules/pip.py tests/unit/modules/archive_test.py tests/unit/modules/pip_test.py	2015-01-09 11:39:09 -07:00
Mike Place	b419366443	Release note note ... Fixes #18551	2015-01-08 16:41:20 -07:00
twellspring	f8883cebdd	Add private subnets ... Added how to enable rackspace private subnets on servers instantiated by salt cloud	2015-01-02 19:28:45 -08:00
Colton Myers	cc74c400b9	Add docs for mine in salt-ssh	2014-12-23 12:14:31 -07:00
Colton Myers	139bd8df5b	Add salt-ssh mine to lithium release notes	2014-12-23 11:35:40 -07:00
Colton Myers	321413e638	Rename lithium release notes to 2015.2.0	2014-12-23 11:34:52 -07:00
Colton Myers	dc778a8e5e	Merge branch '2014.7' into develop ... Conflicts: salt/client/ssh/__init__.py salt/states/boto_secgroup.py	2014-12-23 10:57:26 -07:00
Colton Myers	f2fd892dc5	Merge pull request #19145 from whiteinge/sphinx-fixups ... Minor Sphinx fixups	2014-12-22 16:25:01 -07:00