-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Patch v2018.3.5 #68250
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
base: master
Are you sure you want to change the base?
Patch v2018.3.5 #68250
Conversation
….3.5 Releasenotes for 2018.3.5
Update man pages for 2018.3.5
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't make changes to the man pages directly. These are auto-generated.
Looks like you have some merge conflicts
# from salt.ext.six.moves import map | ||
from salt.ext.six.moves import map | ||
# from six.moves import map |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This whole file can be reverted to remove the commented code since there are no actual changes.
@@ -1445,7 +1445,7 @@ def generate_random_name(prefix, size=6): | |||
|
|||
.. versionadded:: 2018.3.0 | |||
|
|||
prefix | |||
efix |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be prefix
@@ -101,3 +101,4 @@ tests/integration/cloud/providers/pki/minions | |||
.bundle/ | |||
Gemfile.lock | |||
/artifacts/ | |||
venv-salt/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needs a new line
What does this PR do?
Merge the changes for fixing the root path traversal issue.
What issues does this PR fix or reference?
Fixes
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes/No