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

[2019.2] Merge forward from 2018.3 to 2019.2 #51232

Merged
merged 129 commits into from Jan 18, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Jan 17, 2019

Conflicts:

  • salt/cloud/clouds/azurearm.py
  • salt/minion.py
  • salt/utils/network.py
max-arnold and others added 30 commits Dec 15, 2018
Also remove the mention of obsolete "grains" output format.
This fix was originally made in PR #45347, then pulled into another
branch under PR #45811, but was clobbered by c3f1587. This commit
just restores the fix.
Resolves #38502.
Add unit test to ensure we don't diff bare repos
…x to rallytime@430c462 in the proxy module.
…gs_list

[2018.3] Fix to nxos module
[2018.3] Merge forward from 2017.7 to 2018.3
…rking-searchdomain

get searchdomain in Ubuntu 12+ (2017.7)
This is not logging, printf-style expansion is not performed
Typos in index_template_present documentation
Fix profile outputter docs
Issue #50849.
Fixes mysql server version comparison.
Fixed exception when looking up interface ID.
Also allow resource_group to be passed via kwargs.
Adapted API call for current Azure SDK
aphor and others added 22 commits Jan 11, 2019
confession: tests failed to complete on gitub notification auth failure,
so I want to trigger another test.
This reverts commit a07f356.

It wasn't necessary, and I want to trigger another round of tests on a Friday night.
Avoid exceptions by passing bytes to idna
More descriptive error when missing GitPython or PyGit2
Fix improper exception raises (2018.3)
 [2018.3] Update to salt-bootstrap v2019.01.08
Allow unauthenticated bind for listing LDAP groups
Update OpsGenie to use their V2 API (2018.3)
Add random sleep time to avoid overloading Windows
2018.3 azurearm py3
Apparently, you can't always use __salt__ in a util
Backport #50918 into 2018.3
Fix win_lgpo_auditpol salt util on Windows
 Conflicts:
	setup.py
[2018.3] Back-port PR #51124 to 2018.3
See #51211.

2019-01-08 09:57:23,653 [salt.master      :1795][ERROR   ][28091] Error in function _file_list:
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/master.py", line 1788, in run_func
    ret = getattr(self, func)(load)
  File "/usr/lib/python2.7/dist-packages/salt/utils/decorators/__init__.py", line 594, in wrapped
    **salt.utils.data.decode_dict(kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 752, in file_list
    ret.update(self.servers[fstr](load))
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/roots.py", line 422, in file_list
    return _file_lists(load, 'files')
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/roots.py", line 310, in _file_lists
    __opts__, form, list_cache, w_lock
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 122, in check_file_list_cache
    if not os.path.isfile(list_cache) and _lock_cache(w_lock):
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 56, in _lock_cache
    os.mkdir(w_lock)
OSError: [Errno 2] No such file or directory: '/var/cache/salt/master/file_lists/roots/.foo/bar.w'
Fixes: #51211
Allow slashes in file_roots envs.
Conflicts:
  - salt/cloud/clouds/azurearm.py
  - salt/minion.py
  - salt/utils/network.py
@Ch3LL Ch3LL requested a review from saltstack/team-core as a code owner Jan 17, 2019
@garethgreenaway garethgreenaway self-requested a review Jan 18, 2019
@garethgreenaway garethgreenaway merged commit 3edaf18 into saltstack:2019.2 Jan 18, 2019
8 of 10 checks passed
8 of 10 checks passed
continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP Ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
@Ch3LL Ch3LL deleted the Ch3LL:merge-2019.2 branch Jan 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
You can’t perform that action at this time.