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

[2019.2] Merge forward from 2018.3 to 2019.2 #51776

Merged
merged 81 commits into from Feb 24, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Feb 23, 2019

Conflicts:

  • doc/ref/modules/all/index.rst
  • salt/states/file.py
  • tests/unit/modules/test_yumpkg.py
  • tests/unit/modules/test_zypperpkg.py
  • tests/unit/states/test_file.py
lmf-mx and others added 30 commits Jan 15, 2019
If for example a pillar contains binary data it's possible that it won't
be possible to print it when doing e.g pillar.items:

  File "/usr/lib/python3/dist-packages/salt/output/__init__.py", line 232, in strip_esc_sequence
    return txt.replace('\033', '?')
TypeError: a bytes-like object is required, not 'str'

Replace non-printable data during output with a message instead.
[2017.7] Use the code directory instead of cwd for python path
[2017.7]  Wait for minions to be pingable before starting tests
Handle multi_master failover when daemonized
Fix service name in minion plist
[2017.7] Allow NOT to install pip dependencies
Fix pylint on 2017.7
[2017.7] increase batch test timeout on windows
[2018.3.4] increase batch test timeout on windows
[2017.7]  Increase minion wait for slow boxes
…nge_check

Bugfix : Fix RabbitMQ policy definition change check
dwoz and others added 21 commits Feb 20, 2019
[2018.3] Merge forward from 2018.3.4 to 2018.3
[2018.3] Skip solarisips when not on solaris
fix modulenames from virtualnames tests
[2018.3] Add initial nox configuration. Tell `tox`'ers to use `nox`'.
[2018.3] Nftables cleanup
fix minion bootstrapping issue
Issue #49297
Make binary data output possible
Fix escaping for special charaters
This should fix the following integration tests
integration.states.test_file.FileTest.test_directory_clean_require_in
integration.states.test_file.FileTest.test_directory_clean_require_in_with_id
integration.states.test_file.FileTest.test_directory_clean_require_with_name
integration.states.test_file.FileTest.test_recurse_clean
integration.states.test_file.FileTest.test_recurse_clean_specific_env
Make recurse and directory case sensitive
Conflicts:
  - doc/ref/modules/all/index.rst
  - salt/states/file.py
  - tests/unit/modules/test_yumpkg.py
  - tests/unit/modules/test_zypperpkg.py
  - tests/unit/states/test_file.py
@garethgreenaway garethgreenaway requested a review from saltstack/team-core Feb 23, 2019
…ll/index.rst.
@dwoz
dwoz approved these changes Feb 24, 2019
@dwoz dwoz merged commit 45425a4 into saltstack:2019.2 Feb 24, 2019
10 checks passed
10 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
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
@garethgreenaway garethgreenaway deleted the garethgreenaway:merge-2018.3 branch Mar 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
You can’t perform that action at this time.