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 #48252

Merged
merged 32 commits into from Jun 22, 2018

Conversation

Projects
None yet
7 participants
@rallytime
Contributor

rallytime commented Jun 21, 2018

Conflicts:

  • doc/ref/configuration/minion.rst
  • salt/minion.py
  • salt/modules/dockermod.py
  • salt/modules/lxc.py
  • salt/utils/init.py
  • tests/unit/modules/test_mount.py

KaiSforza and others added some commits Jun 11, 2018

Add docs, kitchen tests
Also remove a pwd call from the lint, we don't need it anymore.
Fix py3-incompatible dict.keys()[x] call in apk.py
Fixes #48128

Previous line worked fine on Python 2.7, but on 3, emits:

`TypeError: 'dict_keys' object does not support indexing`
Fix the version number in versionadded
2017.7.7 has already been released
Fix mount.vfstab unit test
This test was calling mount.fstab() instead of mount.vfstab()
Merge pull request #48174 from terminalmage/docker-update-mine
Add docker.update_mine config option
Merge pull request #48115 from KaiSforza/pr-lint-2017
Add jenkinsfiles to define tests in 2017
zer0def
Merge pull request #48201 from zer0def/lxc-bootstrap-fixes
Fixes to LXC bootstrap when alternate lxcpath is provided.
Merge pull request #48192 from twangboy/fix_pip_version_2017.7
Use the --disable-pip-version-check option (2017.7)
Merge pull request #48185 from DSRCorporation/bugs/47901_future_done_…
…exception

Don't call .exception() on future unless it's done.
Merge pull request #48131 from bowmanjd-lms/fix-apk-python3
Fix py3-incompatible dict.keys()[x] call in apk.py
Fix docstring construction in alias_function when Salt installed usin…
…g -OO

This removes the docstring, so fun.__doc__ is None, which raises an
exception when we try to concatenate these.
Don't display "None" in SaltInvocationError when Salt installed using…
… -OO

When there is no docstring, just omit it from the return instead.
Merge pull request #48227 from Ch3LL/fix_win_tests
Skip new sha256 files on repo.saltstack.com/windows

rallytime added some commits Jun 20, 2018

Merge pull request #48226 from terminalmage/fix-alias-docstring
2 fixes for when Salt is installed using -OO
Merge branch '2017.7' into '2018.3'
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/minion.py
  - salt/modules/dockermod.py
  - salt/modules/lxc.py
  - salt/utils/__init__.py
  - tests/unit/modules/test_mount.py

@rallytime rallytime requested a review from saltstack/team-core as a code owner Jun 21, 2018

@rallytime rallytime merged commit 67cb556 into saltstack:2018.3 Jun 22, 2018

7 of 9 checks passed

jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10897 — ABORTED
Details
default Build finished.
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26130 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18182 — SUCCESS
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5926 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23855 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22817 — SUCCESS
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19979 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Jun 22, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment