cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[2.8] fixed _merge_dictionaries calls in GcpSession class

Browse source 
(cherry picked from commit c24b841c0a)
This commit is contained in:
Itai Malek 2019-07-28 05:30:24 +03:00 committed by Toshio Kuratomi
parent b866036365
commit ac1e647e55
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/gcp-session-merge_dict.yml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- Fix call from "merge_dictionaries" to "_merge_dictionaries" in GcpSession object (https://github.com/ansible/ansible/issues/57140).

4
lib/ansible/module_utils/gcp_utils.py
View file

@ -87,7 +87,7 @@ class GcpSession(object):
def post(self, url, body=None, headers=None, **kwargs):
if headers:
headers = self.merge_dictionaries(headers, self._headers())
headers = self._merge_dictionaries(headers, self._headers())
else:
headers = self._headers()
@ -98,7 +98,7 @@ class GcpSession(object):
def post_contents(self, url, file_contents=None, headers=None, **kwargs):
if headers:
headers = self.merge_dictionaries(headers, self._headers())
headers = self._merge_dictionaries(headers, self._headers())
else:
headers = self._headers()