From a02fa7dd1f6b30929829b40e1627127099f2e224 Mon Sep 17 00:00:00 2001 From: Ch3LL Date: Tue, 28 Mar 2017 12:38:45 -0600 Subject: [PATCH 1/5] [2016.3] Bump previous version to 2016.3.6 --- doc/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index a4e591c4eb..9c8ecd4281 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -214,7 +214,7 @@ project = 'Salt' version = salt.version.__version__ latest_release = '2016.11.3' # latest release -previous_release = '2016.3.5' # latest release from previous branch +previous_release = '2016.3.6' # latest release from previous branch previous_release_dir = '2016.3' # path on web server for previous branch next_release = '' # next release next_release_dir = '' # path on web server for next release branch From f532ec5288e23fa1256db2a48f8cba2373826127 Mon Sep 17 00:00:00 2001 From: Ch3LL Date: Wed, 29 Mar 2017 09:34:03 -0600 Subject: [PATCH 2/5] initial 2016.3.7 release notes --- doc/topics/releases/2016.3.7.rst | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/topics/releases/2016.3.7.rst diff --git a/doc/topics/releases/2016.3.7.rst b/doc/topics/releases/2016.3.7.rst new file mode 100644 index 0000000000..ccde8c40db --- /dev/null +++ b/doc/topics/releases/2016.3.7.rst @@ -0,0 +1,5 @@ +=========================== +Salt 2016.3.7 Release Notes +=========================== + +Version 2016.3.7 is a bugfix release for :ref:`2016.3.0 `. From 14c6575655f61ea79c1d8b4b283e64add0263e92 Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Wed, 29 Mar 2017 12:06:03 -0500 Subject: [PATCH 3/5] Add docker-py version to the versions report --- salt/version.py | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/version.py b/salt/version.py index df259d3b0d..46599d7ae6 100644 --- a/salt/version.py +++ b/salt/version.py @@ -566,6 +566,7 @@ def dependency_information(include_salt_cloud=False): ('python-gnupg', 'gnupg', '__version__'), ('mysql-python', 'MySQLdb', '__version__'), ('cherrypy', 'cherrypy', '__version__'), + ('docker-py', 'docker', '__version__'), ] if include_salt_cloud: From 4c0763fa2f5f5ceeb5da0a5c940030d920f57964 Mon Sep 17 00:00:00 2001 From: Elena Konoreva Date: Thu, 30 Mar 2017 02:10:40 +0300 Subject: [PATCH 4/5] Added split to cut off debian_revision from rabbitmq-server version Fixes #40396 --- salt/modules/rabbitmq.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/modules/rabbitmq.py b/salt/modules/rabbitmq.py index c9098e686f..fd4fe1678f 100644 --- a/salt/modules/rabbitmq.py +++ b/salt/modules/rabbitmq.py @@ -318,7 +318,7 @@ def check_password(name, password, runas=None): if server_version is None: 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('.')] except ValueError: version = (0, 0, 0) From 66251263cfdf9ec174af68c25a071a0e834a7d41 Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Thu, 30 Mar 2017 11:10:43 -0500 Subject: [PATCH 5/5] Fix open filehandles This fixes two cases of filehandles being left open by failing to use a with clause. --- salt/crypt.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/salt/crypt.py b/salt/crypt.py index 8bfc875f1b..e9e4f15dad 100644 --- a/salt/crypt.py +++ b/salt/crypt.py @@ -862,7 +862,8 @@ class AsyncAuth(object): m_pub_fn = os.path.join(self.opts['pki_dir'], self.mpub) m_pub_exists = os.path.isfile(m_pub_fn) 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', '') != \ local_master_pub.replace('\n', '').replace('\r', ''): @@ -912,7 +913,8 @@ class AsyncAuth(object): if not m_pub_exists: # the minion has not received any masters pubkey yet, write # the newly received pubkey to minion_master.pub - salt.utils.fopen(m_pub_fn, 'wb+').write(payload['pub_key']) + with salt.utils.fopen(m_pub_fn, 'wb+') as fp_: + fp_.write(payload['pub_key']) return self.extract_aes(payload, master_pub=False) def _finger_fail(self, finger, master_key):