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

Merged
merged 67 commits into from Aug 24, 2018

Conversation

Projects
None yet
@rallytime
Copy link
Contributor

commented Aug 23, 2018

Conflicts:

  • salt/modules/file.py
  • salt/modules/win_service.py
  • salt/states/mount.py
  • salt/states/service.py
  • tests/integration/init.py
  • tests/integration/runners/test_state.py
  • tests/integration/states/test_file.py
  • tests/unit/states/test_file.py

zer0def and others added some commits Jun 8, 2018

Merge pull request #49103 from dwoz/cmd_test_fix
Install the launcher so we can execute py files
Multiple fixes for integration.states.test_file
- Fix wart in PR #49087 file://c:\foo\bar vs c:\foo\bar local paths
- Finalize fix for test_issue_8343_accumulated_require_in
- Fix wart in PR #49088 Ignore proper directory test
Merge pull request #49118 from dwoz/test_file_fixes
Multiple fixes for integration.states.test_file
Merge pull request #49136 from Ch3LL/bootstrap_2017.7
[2017.7] Update bootstrap script to latest release (2018.08.15)
Add timeout parameter
Add a timeout parameter to start, stop, restart, and delete
Add timeout support to the state
Remove redundent net stop command from the stop function
Remove extra _enable call on Windows that was causing incorrect state
return comments
2017_win_service_damon
Merge this if you like the suggestion.
Fix bug in keep_source for non-templated salt:// file sources
Unless the file is one of A) a remote file source (http/https/ftp/etc.)
or B) being templated, then `file.get_managed` does not cache the file.
Thus, the variable we rely on to tell us the cached path is an empty
string, and we don't remove it even though the file would eventually
later be cached when we run `file.manage_file`. This adds some
additional logic to ensure that we do check if the file has been cached
if `sfn` is an empty string.
Merge pull request #49163 from dwoz/tmp_dir
Allow test suite to finish if tmp dir removal fails
Fix start/stop functions
Fix typo in the dict key 'Status'
Standardize docs
Fix some lint issues
Rename the new helper function to _status_wait
Add urls to code comments
Add version added statements
Improve timeout in delete
Improved error handling
Merge pull request #49167 from dwoz/filefix
Fix remaining file state integration tests (py3)
Mike Place
Mike Place

twangboy and others added some commits Aug 20, 2018

Allow compound matching in eauth config expressions
When we try to match the configured expression, we look for a match type
(e.g. `I@`, `G@`, etc.) at the beginning, and when we don't find one we
were falling back to a glob. This changes the fallback to compound so
that we can support compound matches. Note that the compound matching
engine will act just like the glob match engine when the host passed to
it is a single minion ID glob, so using compound as the fallback gets
you glob matching for free.
Merge pull request #49236 from terminalmage/issue32737
Allow compound matching in eauth config expressions
Mike Place
Mike Place
Merge pull request #49231 from minusf/mount-check-name
Check for mandatory parameters for `mount.mounted`
Mike Place
extend #488588 to cover SyncAuth class
the original fix was only covered asyncauth, but the syncauth method overrode
the fix. This patch duplicates it so behavior should be consistent in both
codepaths.
Merge pull request #49144 from twangboy/fix_48163
Add timeout parameter to win_service functions
Merge pull request #49262 from bloomberg/short-circuit
extend #48588 to cover SyncAuth class
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/modules/file.py
  - salt/modules/win_service.py
  - salt/states/mount.py
  - salt/states/service.py
  - tests/integration/__init__.py
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py

@rallytime rallytime requested a review from saltstack/team-core as a code owner Aug 23, 2018

@@ -870,7 +870,7 @@ def test_directory(self):
'comment': comt,
'result': None,
'pchanges': p_chg,
'changes': {}
'changes': {name: {'directory': 'new'}}

This comment has been minimized.

rallytime added some commits Aug 23, 2018

Fix unit test for file state
Chose the wrong side of a merge conflict resolution. This commit restores
the correct testing behavior.
@rallytime

This comment has been minimized.

Copy link
Contributor Author

commented Aug 23, 2018

The last 2 commits should fix 2 of the test failures. I need to investigate the final test failure more and discuss a fix from @terminalmage in the morning.

@rallytime

This comment has been minimized.

Copy link
Contributor Author

commented Aug 24, 2018

OK, this should be good now, pending tests.

@rallytime rallytime merged commit 914bb09 into saltstack:2018.3 Aug 24, 2018

6 of 8 checks passed

jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py3-centos-7 running py3-centos-7...
Details
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 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 24, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.