shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-23 17:34:17 +03:00
Code Issues Releases Wiki Activity

merged from 2.1

Browse Source
This commit is contained in:
Adolfo Gómez García 2016-10-14 06:56:43 +02:00
commit 0711bf5db3
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actors/linux/debian/changelog
View File

@ -1,3 +1,9 @@
udsactor (2.1.0) stable; urgency=medium
* Fixes for 2.1.0 release
-- Adolfo Gómez García <agomez@virtualcable.es> Tue, 11 Oct 2016 08:00:22 +0200
udsactor (2.0.0) stable; urgency=medium
* Upgrade for 2.0.0

6
actors/linux/debian/files
View File

@ -1,3 +1,3 @@
udsactor-nx_2.0.0_all.deb x11 optional
udsactor-xrdp_2.0.0_all.deb x11 optional
udsactor_2.0.0_all.deb admin optional
udsactor-nx_2.1.0_all.deb x11 optional
udsactor-xrdp_2.1.0_all.deb x11 optional
udsactor_2.1.0_all.deb admin optional

3
server/src/uds/core/__init__.py
View File

@ -38,7 +38,6 @@ from __future__ import unicode_literals
from uds.core.Environment import Environmentable
from uds.core.Serializable import Serializable
from uds.core.BaseModule import Module
import time
VERSION = '2.0.0-DEVEL'
VERSION = '2.x.x-DEVEL'
VERSION_STAMP = '{}-DEVEL'.format(time.strftime("%Y%m%d"))

4
server/src/uds/core/managers/UserServiceManager.py
View File

@ -51,7 +51,7 @@ import requests
import json
import logging
__updated__ = '2016-09-16'
__updated__ = '2016-10-13'
logger = logging.getLogger(__name__)
@ -403,7 +403,7 @@ class UserServiceManager(object):
# In fact we ignore result right now
except Exception as e:
logger.info('Get uuid failed: {}. Check connection on destination machine: {}'.format(e, url))
return False
# return True
return True