1000 Commits

Author	SHA1	Message	Date
rallytime	e698bc3508	Fix more warnings in doc build	2017-02-16 11:20:35 -07:00
Megan Wilhite	1acf00da3b	add 2016.11.3 changelog to release notes (#39451)	2017-02-16 10:49:53 -07:00
Daniel Wallace	3172e88700	Add release notes for cisco proxy minions added in Carbon	2017-02-16 10:05:33 -06:00
rallytime	2f74dcf685	Various doc updates to fix warnings in doc build	2017-02-06 16:56:58 -07:00
rallytime	b2b3989773	Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/engines/__init__.py - salt/loader.py	2017-01-30 16:58:31 -07:00
rallytime	b732a1f646	Merge branch '2015.8' into '2016.3' ... No conflicts.	2017-01-30 16:45:16 -07:00
Nicole Thomas	56ccae6ff7	Add 2015.8.14 release notes file (#39046)	2017-01-30 16:44:00 -07:00
Nicole Thomas	fef1b1133d	Add 2016.3.6 release notes file (#39045)	2017-01-30 16:43:50 -07:00
Nicole Thomas	0943872fab	Add 2016.11.3 release notes file (#39044)	2017-01-30 16:43:40 -07:00
Nicole Thomas	424e68436e	Update 2016.11.2 release notes (#39039)	2017-01-30 15:40:00 -07:00
Nicole Thomas	ff324599d5	Update 2016.3.5 release notes (#39038)	2017-01-30 15:39:47 -07:00
Nicole Thomas	5943fe65d3	Update 2015.8.13 release notes (#39037)	2017-01-30 15:39:33 -07:00
rallytime	ee33a53a64	Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/modules/dockerng.py - tests/unit/doc_test.py	2017-01-25 09:43:12 -07:00
Megan Wilhite	2786e209c6	add 2016.11.2 changelog to release notes (#38848)	2017-01-20 15:32:45 -07:00
Ch3LL	31f324c4ff	add 2016.3.5 changelog to release notes	2017-01-19 15:43:28 -07:00
rallytime	30e8a66fb0	Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/netapi/rest_tornado/saltnado.py - tests/integration/netapi/rest_tornado/test_app.py	2017-01-16 18:54:14 -07:00
rallytime	d24776f5e9	Merge branch '2015.8' into '2016.3' ... Conflicts: - conf/master - doc/topics/netapi/index.rst - salt/netapi/__init__.py	2017-01-15 16:07:55 -07:00
rallytime	b910499dbe	Various follow up fixes ... Merge branch '2015.8.12_follow_up' into '2015.8'	2017-01-13 14:40:17 -07:00
rallytime	e8309a6bbf	Add release notes for 2015.8.13	2017-01-09 14:25:31 -07:00
twangboy	e96bfe8fa2	Change OSX/OS X to macOS where possible	2016-12-28 14:49:46 -07:00
rallytime	c6e191ad0d	Remove doc markup references from 2016.11 branch	2016-12-19 15:14:37 -07:00
rallytime	513058945c	Merge branch '2016.3' into '2016.11' ... Conflicts: - doc/ref/states/requisites.rst - doc/topics/cloud/profitbricks.rst - doc/topics/cloud/vsphere.rst - doc/topics/releases/0.9.8.rst - doc/topics/releases/releasecandidate.rst - salt/cloud/clouds/vsphere.py - salt/minion.py - salt/states/archive.py - tests/unit/states/archive_test.py	2016-12-19 14:58:39 -07:00
rallytime	23bce1c929	Remove ":doc:" references from all doc/topics/releases/* files	2016-12-15 16:45:51 -07:00
rallytime	4aafa41d22	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
rallytime	6e32267d0c	Remove ":doc:" references in salt/* files	2016-12-15 14:03:56 -07:00
Nicole Thomas	56a8fa3f77	Add 2016.11.2 release notes (#38260)	2016-12-14 16:40:06 -07:00
Megan Wilhite	f7294dc85b	add 2016.11.1 changelog to release notes (#38186)	2016-12-09 15:44:09 -07:00
Joseph Hall	71b787e250	Add Azure ARM docs for 2016.11.0	2016-12-08 12:43:18 -07:00
Megan Wilhite	1a42e24e72	Fix beacon index (#38129) ... * add new beacon modules to index * add salt.beacons.avahi_announce to index and release notes	2016-12-07 10:44:53 -07:00
Nicole Thomas	1bb31bbebd	Start release notes file for 2016.11.1 release (#38084)	2016-12-05 15:24:11 -07:00
Ch3LL	e95f88fbe3	add docs for hash_type change to sha256	2016-12-02 09:28:50 -07:00
Dmitry Kuzmenko	e51448f5ed	Added Carbon release notes. Fixed sphinx errors in the file. (#38022)	2016-12-01 09:59:15 -07:00
Nicole Thomas	186b3c7959	Fix RST link format (#37958) (#37970)	2016-11-29 14:34:07 -07:00
Nicole Thomas	8f986b28dc	Remove release candidate doc ref from 2016.11.0 release notes (#37931)	2016-11-28 13:49:28 -07:00
Nicole Thomas	0f8b187d15	Merge pull request #37923 from rallytime/merge-2016.11 ... [2016.11] Merge forward from 2016.3 to 2016.11	2016-11-28 12:55:03 -07:00
Thomas S Hatch	14271156f6	Add a release notes reference to the docker-sls tutorial (#37927)	2016-11-28 12:54:17 -07:00
rallytime	dfedd1185a	Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/grains/core.py - salt/modules/ddns.py - salt/templates/rh_ip/network.jinja	2016-11-28 11:08:19 -07:00
rallytime	523a67c422	Merge branch '2015.8' into '2016.3' ... Conflicts: - doc/conf.py - doc/topics/releases/version_numbers.rst	2016-11-28 10:52:52 -07:00
Erik Johnson	4cdc6cf5ec	Update earlier release channels' docs with Carbon release notes (#37914) ... * Update reference to Carbon in vsphere docs * Replace reference to Carbon in top file merging docs * Include Carbon version number * Replace references to Carbon with 2016.11.0	2016-11-28 10:33:31 -07:00
Benjamin Drung	9a51ba5c5b	Fix various spelling mistakes	2016-11-24 16:00:31 +01:00
Erik Johnson	62f998d013	Update RST and release notes for Carbon release (#37715) ... Since v2016.11.0rc2 will not become v2016.11.0, the docs needed to be updated regarding a bugfix that was originally slated for 2016.11.1 since it came after RC2 was cut.	2016-11-15 16:51:31 -07:00
rallytime	0e332ab591	Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/cli/batch.py - salt/cli/salt.py - salt/transport/client.py - salt/utils/vmware.py - tests/integration/modules/sysmod.py	2016-11-14 09:14:00 -07:00
Mike Place	a97c2ad34b	Merge pull request #37640 from rallytime/update-release-notes ... Add known issue #37541 to 2016.3.4 release notes	2016-11-12 09:28:12 +13:00
rallytime	6d6de12aff	Grammatical fix	2016-11-11 11:03:57 -07:00
C. R. Oldham	1ca5b958c6	Forward-port change from 2015.8 adding release note for rotate_aes_key	2016-11-11 10:36:47 -07:00
C. R. Oldham	a01b66556f	Add docs for rotate_aes_key (#37641)	2016-11-11 10:30:46 -07:00
rallytime	24d7f20e16	Add known issue #37541 to 2016.3.4 release notes ... Refs #37541	2016-11-11 09:46:28 -07:00
Nicole Thomas	8ba9ceda50	Merge pull request #37609 from rallytime/merge-2016.11 ... [2016.11] Merge forward from carbon to 2016.11	2016-11-10 15:48:43 -07:00
Nicole Thomas	06786f9617	Remove the v from the tag reference (#37595) ... When installing with pip, we just need the package version. No `v`.	2016-11-10 09:41:34 -07:00
rallytime	f44e14b63c	Merge branch 'carbon' into '2016.11' ... Conflicts: - salt/modules/file.py	2016-11-09 12:56:58 -07:00