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
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
Update test for new gem ver
[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
Don't modify self.opts directly
…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
added
the
pending-changes
The pull request needs additional changes before it can be merged
label
Nov 29, 2016
Actually, after looking at the 2016.3 branch more closely, these tests are failing there as well. |
Closing until the test failures on 2016.3 are resolved. I'll redo the merge forward then. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conflicts: