11 Commits

Author	SHA1	Message	Date
rallytime	cdb45874de	Merge branch '2017.7.6' into '2017.7' ... Conflicts: - doc/topics/releases/2017.7.6.rst - requirements/base.txt	2018-06-13 15:04:55 -04:00
rallytime	1b8d1c936b	Remove "in progress" info for 2017.7.6 release notes	2018-06-13 09:49:47 -04:00
Erik Johnson	d37f7e4f04	Add 2017.7.6 release notes	2018-05-31 15:28:25 -05:00
Erik Johnson	93ee5ee2b0	Fix all Sphinx warnings ... Well, all but one, which we expect to see	2018-05-31 15:28:25 -05:00
rallytime	58dee4c829	Remove sentence about the release being in progress	2018-05-29 16:27:43 -04:00
rallytime	b3dcb7330e	Remove "in progress" too	2018-05-29 16:26:28 -04:00
rallytime	99e1df7823	Update 2017.7.6 release notes: remove "unreleased" text ... In preparation for the 2017.7.6 release, remove the "unreleased" text from the release notes.	2018-05-29 15:31:51 -04:00
Daniel Wallace	a1c1b5b5cf	allow tornado 5.0 to be installed only for python2	2018-05-29 13:57:54 -05:00
Ch3LL	d4aa83b92d	Add changelog to 2017.7.6 release notes	2018-05-21 10:01:00 -04:00
Ch3LL	b6d0cc2ab7	Add In Progress Warning for 2017.7.6 Release Notes	2018-05-03 12:06:15 -04:00
Erik Johnson	b4a1d34b47	Add option to return to pre-2017.7.3 pillar include merge order ... https://github.com/saltstack/salt/pull/45025 changed the pillar include merge order. This adds a new config option which allows a user to revert to the pre-2017.7.3 behavior.	2018-03-22 13:35:12 -05:00