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

Merged
merged 29 commits into from Feb 17, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Feb 15, 2019

Conflicts:

  • pkg/windows/build_env_2.ps1
  • pkg/windows/req.txt
  • salt/_compat.py
  • salt/engines/slack.py
  • salt/modules/dockermod.py
  • salt/modules/git.py
  • salt/modules/heat.py
  • salt/modules/incron.py
  • salt/modules/lxc.py
  • salt/modules/memcached.py
  • salt/modules/network.py
  • salt/modules/nspawn.py
  • salt/modules/saltutil.py
  • salt/modules/win_network.py
  • salt/modules/yumpkg.py
  • salt/serializers/yaml.py
  • salt/states/heat.py
  • salt/states/module.py
  • salt/states/rabbitmq_policy.py
  • salt/states/virtualenv_mod.py
  • salt/states/win_system.py
  • salt/utils/master.py
  • tests/integration/cli/test_batch.py
  • tests/support/case.py
lmf-mx and others added 28 commits Jan 15, 2019
[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
[2017.7]  Increase minion wait for slow boxes
…nge_check

Bugfix : Fix RabbitMQ policy definition change check
Conflicts:
  - pkg/windows/build_env_2.ps1
  - pkg/windows/req.txt
  - salt/_compat.py
  - salt/engines/slack.py
  - salt/modules/dockermod.py
  - salt/modules/git.py
  - salt/modules/heat.py
  - salt/modules/incron.py
  - salt/modules/lxc.py
  - salt/modules/memcached.py
  - salt/modules/network.py
  - salt/modules/nspawn.py
  - salt/modules/saltutil.py
  - salt/modules/win_network.py
  - salt/modules/yumpkg.py
  - salt/serializers/yaml.py
  - salt/states/heat.py
  - salt/states/module.py
  - salt/states/rabbitmq_policy.py
  - salt/states/virtualenv_mod.py
  - salt/states/win_system.py
  - salt/utils/master.py
  - tests/integration/cli/test_batch.py
  - tests/support/case.py
@Ch3LL Ch3LL requested a review from saltstack/team-core as a code owner Feb 15, 2019
@dwoz
dwoz approved these changes Feb 15, 2019
@Ch3LL Ch3LL requested a review from s0undt3ch Feb 15, 2019
@s0undt3ch s0undt3ch merged commit a59585d into saltstack:2018.3 Feb 17, 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
@Ch3LL Ch3LL deleted the Ch3LL:merge-2018.3 branch Mar 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants
You can’t perform that action at this time.