Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

master-port 49822 and 52217 #54977

Merged
merged 12 commits into from
Jan 6, 2020
Merged

master-port 49822 and 52217 #54977

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a4ddb5c
Merge pull request #49822 from mchugh19/xml_module
Oct 19, 2018
3e0550a
include release notes
mchugh19 Oct 12, 2019
94212a8
Merge pull request #52217 from mchugh19/xml_doc
twangboy Mar 21, 2019
b10b137
Doc corrections
mchugh19 Nov 7, 2019
44adc6f
Merge branch 'master' into port-49822
mchugh19 Dec 13, 2019
3c764e3
Merge branch 'master' into port-49822
mchugh19 Dec 20, 2019
b7e6688
Merge branch 'master' into port-49822
mchugh19 Dec 27, 2019
3e431b8
Merge branch 'master' into port-49822
mchugh19 Dec 28, 2019
30cc99b
Merge branch 'master' into port-49822
mchugh19 Dec 30, 2019
51b5b0c
remove no_mock
mchugh19 Dec 30, 2019
e3fd56d
Remove NO_MOCK
mchugh19 Dec 31, 2019
ac44cf3
remove unneeded skipif import
mchugh19 Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
include release notes
  • Loading branch information
@mchugh19
mchugh19 committed Oct 12, 2019
commit 3e0550a068b50cd82fceae4362acbcb31f472a47
3 changes: 0 additions & 3 deletions doc/topics/releases/neon.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
==================================
Salt Release Notes - Codename Neon
==================================
<<<<<<< HEAD
=======


Saltcheck Updates
Expand Down Expand Up @@ -292,4 +290,3 @@ State Deprecations
- Support for the ``force`` kwarg has been removed from the
:py:func:`win_servermanager.installed <salt.statues.win_servermanager.installed>`
function. Please use ``recurse`` instead.
>>>>>>> efd2365190... Merge pull request #49822 from mchugh19/xml_module