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

Merged
merged 30 commits into from Aug 14, 2018

Conversation

Projects
None yet
6 participants
@rallytime
Contributor

rallytime commented Aug 14, 2018

Conflicts:

  • salt/modules/file.py
  • salt/modules/reg.py
  • salt/states/reg.py
  • tests/integration/states/test_file.py

newwebash and others added some commits Aug 7, 2018

Revert "Update saltconf ad"
This reverts commit 3ab8cdb.
The osfullname grain differs when using Python2 vs Python3, swapping …
…this out for the "OS" grain which is consistent.
Fix docs for the registry module and state
Addresses discrepencies about when you should double, single, and not
quote the hive/key parameters
Merge pull request #49059 from twangboy/fix_37984
Fix docs for status.uptime on Windows
Merge pull request #49083 from rallytime/bootstrap-2017.7
[2017.7] Update bootstrap script to latest release
Merge pull request #49045 from twangboy/fix_43164
Fix docs for the registry module and state
Filter out scheme's that are not valid
We don't want to honor schemes that are not valid an example of this is
a string like 'c:\\foo' will have a scheme of 'c' after being parsed.
Merge pull request #49086 from rallytime/new-doc-img
Update the DOCBANNER image for saltconf
Multiple file state test fixes
- Account for hash differences due to line endings
- Ignore tests that are not valid on windows
- Other test fixes due to line endings
Search for (but do not include) CRLF line ending
When searching for a line in a file that has CRLF line endings, the
normal $ regex will not match a line. With this change, we will match on
but not include LF, CRLF, and the end of a file.
Merge pull request #49087 from dwoz/url_file_test_fixes
Filter out scheme's that are not valid
Merge pull request #49088 from dwoz/file_hash_diffs
Multiple file state test fixes
Merge pull request #49090 from dwoz/file_line_fix
Search for (but do not include) CRLF line ending
Merge pull request #49109 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.8 to 2017.7
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/modules/file.py
  - salt/modules/reg.py
  - salt/states/reg.py
  - tests/integration/states/test_file.py

@rallytime rallytime merged commit b412bff into saltstack:2018.3 Aug 14, 2018

5 of 8 checks passed

jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
WIP work in progress
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Aug 14, 2018

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