ae1540a455
- Bugfix: clean up `change` attribute from interface dict (upstream) Issue: https://github.com/saltstack/salt/issues/41461 PR: 1. https://github.com/saltstack/salt/pull/41487 2. https://github.com/saltstack/salt/pull/41533 Added: * clean-up-change-attribute-from-interface-dict.patch - Bugfix: orchestrate and batches returns false failed information https://github.com/saltstack/salt/issues/40635 - speed-up cherrypy by removing sleep call - wrong os_family grains on SUSE - fix unittests (bsc#1038855) - fix setting the language on SUSE systems (bsc#1038855) - Bugfix: unable to use hostname for minion ID as '127' (upstream) - Bugfix: remove sleep call in CheppryPy API handler (upstream) - Fix core grains constants for timezone (bsc#1032931) - Added: * bugfix-unable-to-use-127-as-hostname.patch * fix-grain-for-os_family-on-suse-series.patch * fix-os_family-case-in-unittest.patch * fix-setting-language-on-suse-systems.patch * fixed-issue-with-parsing-of-master-minion-returns-wh.patch * rest_cherrypy-remove-sleep-call.patch * use-correct-grain-constants-for-timezone.patch - Update to 2016.11.4 See https://docs.saltstack.com/en/develop/topics/releases/2016.11.4.html for full changelog - Changed: * add-options-for-dockerng.patch * fix-regression-in-file.get_managed-add-unit-tests.patch OBS-URL: https://build.opensuse.org/request/show/514025 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=89
34 lines
976 B
Diff
34 lines
976 B
Diff
From 2ac331ef9c2e28bb133bda04a5b3f667aff66c6c Mon Sep 17 00:00:00 2001
|
|
From: Silvio Moioli <smoioli@suse.de>
|
|
Date: Mon, 15 May 2017 07:44:05 +0200
|
|
Subject: [PATCH] rest_cherrypy: remove sleep call
|
|
|
|
---
|
|
salt/netapi/rest_cherrypy/app.py | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/salt/netapi/rest_cherrypy/app.py b/salt/netapi/rest_cherrypy/app.py
|
|
index 3e89ff7882..221865a2ee 100644
|
|
--- a/salt/netapi/rest_cherrypy/app.py
|
|
+++ b/salt/netapi/rest_cherrypy/app.py
|
|
@@ -465,7 +465,6 @@ import json
|
|
import os
|
|
import signal
|
|
import tarfile
|
|
-import time
|
|
from multiprocessing import Process, Pipe
|
|
|
|
# Import third-party libs
|
|
@@ -2238,7 +2237,6 @@ class WebsocketEndpoint(object):
|
|
logger.error(
|
|
"Error: Salt event has non UTF-8 data:\n{0}"
|
|
.format(data))
|
|
- time.sleep(0.1)
|
|
|
|
parent_pipe, child_pipe = Pipe()
|
|
handler.pipe = parent_pipe
|
|
--
|
|
2.13.0
|
|
|
|
|