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.

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

[2018.3] Merge forward from 2017.7 to 2018.3 #50867

Merged
merged 54 commits into from Dec 14, 2018

Conversation

Projects
None yet
@Ch3LL
Copy link
Contributor

commented Dec 14, 2018

Conflicts:

  • doc/topics/development/dunder_dictionaries.rst
  • salt/grains/core.py
  • salt/netapi/rest_tornado/saltnado.py

astronouth7303 and others added some commits Nov 26, 2018

astronouth7303 and others added some commits Dec 4, 2018

Fix last key detection in pepa key_value_to_tree
pepa.key_value_to_tree only checks the name of the key when attempting
to identify the last key in a flattened key.  This can lead to strange
behavior when the final key name also occurs earlier in the flatkey.

This change explicitly checks that we are the final key in flatkey
prior to setting value.  Test included.

Also see mickep76/pepa#11 and mickep76/pepa#12
Mike Place
Merge pull request #50756 from GwiYeong/local-client-fix
missing minion result data bug.
Mike Place
Merge pull request #50733 from marmarek/patch-3
Report salt-call exit code from ssh_py_shim.py
Mike Place
Erik Johnson
Merge pull request #50750 from bewing/pepa12
Fix last key detection in pillar.pepa`key_value_to_tree`
Mike Place
Mike Place
Merge pull request #50709 from mattLLVW/service_unmask
service.running unmask option
Brett Benassi
Merge pull request #50816 from dubb-b/2017.7
Pinning bootstrap to the tagged version of salt.
Mike Place
Merge pull request #50844 from twangboy/fix_grains
Fix grains for future windows releases
Mike Place
Merge pull request #50837 from Ch3LL/pyren_doc
Clarify py render docs when data context is available
Mike Place
Merge pull request #50752 from kstreee/fix-memory-leak
Fixes a memory leak which is caused by un-cleared stream connections.
Merge pull request #50863 from 5uper5hoot/fix-issue-50848
Unpack exception args in python3 compatible way.
Merge branch '2017.7' into '2018.3'
Conflicts:
  - doc/topics/development/dunder_dictionaries.rst
  - salt/grains/core.py
  - salt/netapi/rest_tornado/saltnado.py

@Ch3LL Ch3LL requested a review from saltstack/team-core as a code owner Dec 14, 2018

@garethgreenaway garethgreenaway merged commit b95b44f into saltstack:2018.3 Dec 14, 2018

9 of 10 checks passed

jenkins/pr/docs The docs job has failed
Details
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details

@Ch3LL Ch3LL deleted the Ch3LL:merge-2018.3 branch Dec 20, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.