[2019.2] Merge forward from 2018.3 to 2019.2 #51232
Fixed exception when looking up interface ID. Also allow resource_group to be passed via kwargs.
confession: tests failed to complete on gitub notification auth failure, so I want to trigger another test.
See #51211. 2019-01-08 09:57:23,653 [salt.master :1795][ERROR ] 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'
garethgreenaway merged commit
Jan 18, 2019
8 of 10 checks passed
8 of 10 checks passed
continuous-integration/jenkins/pr-merge This commit cannot be builtDetails
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failedDetails
WIP Ready for reviewDetails
jenkins/pr/docs The docs job has passedDetails
jenkins/pr/lint Python lint test has passedDetails
jenkins/pr/py2-centos-7 The py2-centos-7 job has passedDetails
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passedDetails
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passedDetails
jenkins/pr/py3-centos-7 The py3-centos-7 job has passedDetails
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passedDetails
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.