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

Merged
merged 56 commits into from May 30, 2018

Conversation

Projects
None yet
9 participants
@rallytime
Contributor

rallytime commented May 29, 2018

Conflicts:

  • salt/modules/win_snmp.py
  • tests/integration/modules/test_saltutil.py
  • tests/integration/states/test_pkg.py
  • tests/support/helpers.py
  • tests/support/runtests.py
  • tests/unit/fileserver/test_gitfs.py
  • tests/whitelist.txt

twangboy and others added some commits May 9, 2018

Update regexes in core grains for detecting the 'product' grain on
Solaris Sparc systems.  Additionally, copy the 'product' grain to
'productname' to be consistent with other OSes.
Merge pull request #47807 from dwoz/winrmtests
Try an even bigger timeout
Merge pull request #47773 from frogunder/45011
add win_servermanager.list_available test
Merge pull request #47816 from Ch3LL/disable_windows
Add windows to service disable ERROR check in tests
Merge pull request #47500 from dwoz/winuser
Get the current username on windows

rmcintosh and others added some commits May 23, 2018

better debug message
also, give Cloud Profile its proper capitalization

and some minor formatting consistency updates
Merge pull request #47805 from twangboy/add_sign.bat
Add sign.bat script for signing packages
Adding some addition documentation to the reactor runner indicating t…
…hat the reactor system must be active prior to using it.
Merge pull request #47823 from Ch3LL/win_dns_test
Add win_dns module integration tests for windows
Merge pull request #47778 from Ch3LL/win_state_pkg
Add test_pkg integration state tests to windows
Merge pull request #47691 from lomeroe/solaris_product_grains
Update regexes for Solaris 'product' grain and copy to 'productname' grain
Merge pull request #47552 from twangboy/fix_46981
Show GPO settings, raise error if trying to set gpo managed settings
Merge pull request #47846 from Ch3LL/p_refresh_test
Fix flaky refresh pillar integration test
Merge pull request #47847 from garethgreenaway/47833_reactor_runner_d…
…ocumentation

[2017.7] reactor runner documentation
Merge pull request #47853 from dwoz/py3-cloud-test
Fix for py3 ec2 cloud tests
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/modules/win_snmp.py
  - tests/integration/modules/test_saltutil.py
  - tests/integration/states/test_pkg.py
  - tests/support/helpers.py
  - tests/support/runtests.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/whitelist.txt
Update solaris core grains test
The check for zpool grains was moved out of core grains and into
zfs grains. The mock for the call to zpool grains function was failing.

We also need to update any calls to the salt.utils file to use the new
paths.

@rallytime rallytime merged commit b4bac9b into saltstack:2018.3 May 30, 2018

5 of 9 checks passed

jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5369 — ABORTED
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19425 — ABORTED
Details
default Build started sha1 is merged.
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10340 — RUNNING
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25565 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17638 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23303 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22268 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch May 30, 2018

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