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

[2016.11] Merge forward from 2016.3 to 2016.11 #37955

Closed
wants to merge 39 commits into from

Conversation

rallytime
Copy link
Contributor

Conflicts:

  • doc/topics/cloud/vsphere.rst
  • salt/config/init.py
  • salt/templates/rh_ip/network.jinja
  • salt/utils/parsers.py

vutny and others added 30 commits November 4, 2016 15:00
Function modules could keep cached parents' connections in context
that could be reused in scheduled tasks that produces schedule task
hang forever utilizing CPU.
…stack#37914)

* Update reference to Carbon in vsphere docs

* Replace reference to Carbon in top file merging docs

* Include Carbon version number

* Replace references to Carbon with 2016.11.0
Conflicts:
  - doc/conf.py
  - doc/topics/releases/version_numbers.rst
removed an extra character.
Nicole Thomas and others added 9 commits November 28, 2016 12:54
[2016.3] Merge forward from 2015.8 to 2016.3
…work

Fixes no IPv6 functionality in /etc/sysconfig/network
add list_nodes_min to nova driver
…edule_task_hang

Clear functions context in schedule tasks for ZeroMQ.
…work

Fix missing ipv6 options centos network
…ging-opts

Get default logging level and log file from default opts dict
Conflicts:
  - doc/topics/cloud/vsphere.rst
  - salt/config/__init__.py
  - salt/templates/rh_ip/network.jinja
  - salt/utils/parsers.py
@rallytime rallytime added the pending-changes The pull request needs additional changes before it can be merged label Nov 29, 2016
@rallytime
Copy link
Contributor Author

Actually, after looking at the 2016.3 branch more closely, these tests are failing there as well.

@rallytime
Copy link
Contributor Author

Closing until the test failures on 2016.3 are resolved. I'll redo the merge forward then.

@rallytime rallytime closed this Nov 30, 2016
@rallytime rallytime deleted the merge-2016.11 branch November 30, 2016 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pending-changes The pull request needs additional changes before it can be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants