valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2016.3' into '2016.11'

Browse Source 
Conflicts:
  - salt/crypt.py
This commit is contained in:
rallytime 2017-03-30 12:21:44 -06:00
commit d5576d75e7
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/topics/releases/2016.3.7.rst Normal file
View File

@ -0,0 +1,5 @@
===========================
Salt 2016.3.7 Release Notes
===========================
Version 2016.3.7 is a bugfix release for :ref:`2016.3.0 <release-2016-3-0>`.

8
salt/crypt.py
View File

@ -886,7 +886,8 @@ class AsyncAuth(object):
m_pub_fn = os.path.join(self.opts['pki_dir'], self.mpub) m_pub_fn = os.path.join(self.opts['pki_dir'], self.mpub)
m_pub_exists = os.path.isfile(m_pub_fn) m_pub_exists = os.path.isfile(m_pub_fn)
if m_pub_exists and master_pub and not self.opts['open_mode']: if m_pub_exists and master_pub and not self.opts['open_mode']:
local_master_pub = salt.utils.fopen(m_pub_fn).read() with salt.utils.fopen(m_pub_fn) as fp_:
local_master_pub = fp_.read()
if payload['pub_key'].replace('\n', '').replace('\r', '') != \ if payload['pub_key'].replace('\n', '').replace('\r', '') != \
local_master_pub.replace('\n', '').replace('\r', ''): local_master_pub.replace('\n', '').replace('\r', ''):
@ -936,9 +937,8 @@ class AsyncAuth(object):
if not m_pub_exists: if not m_pub_exists:
# the minion has not received any masters pubkey yet, write # the minion has not received any masters pubkey yet, write
# the newly received pubkey to minion_master.pub # the newly received pubkey to minion_master.pub
salt.utils.fopen(m_pub_fn, 'wb+').write( with salt.utils.fopen(m_pub_fn, 'wb+') as fp_:
salt.utils.to_bytes(payload['pub_key']) fp_.write(salt.utils.to_bytes(payload['pub_key']))
)
return self.extract_aes(payload, master_pub=False) return self.extract_aes(payload, master_pub=False)
def _finger_fail(self, finger, master_key): def _finger_fail(self, finger, master_key):

2
salt/modules/rabbitmq.py
View File

@ -319,7 +319,7 @@ def check_password(name, password, runas=None):
if server_version is None: if server_version is None:
raise ValueError raise ValueError
server_version = server_version.group(1) server_version = server_version.group(1).split('-')[0]
version = [int(i) for i in server_version.split('.')] version = [int(i) for i in server_version.split('.')]
except ValueError: except ValueError:
version = (0, 0, 0) version = (0, 0, 0)

1
salt/version.py
View File

@ -594,6 +594,7 @@ def dependency_information(include_salt_cloud=False):
('python-gnupg', 'gnupg', '__version__'), ('python-gnupg', 'gnupg', '__version__'),
('mysql-python', 'MySQLdb', '__version__'), ('mysql-python', 'MySQLdb', '__version__'),
('cherrypy', 'cherrypy', '__version__'), ('cherrypy', 'cherrypy', '__version__'),
('docker-py', 'docker', '__version__'),
] ]
if include_salt_cloud: if include_salt_cloud: