[tryton-debian-vcs] tryton-server branch upstream-3.6 updated. upstream/3.6.13-1-g0a29295

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Tue Mar 14 12:13:38 UTC 2017


The following commit has been merged in the upstream-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=upstream/3.6.13-1-g0a29295

commit 0a292950db3ce486ae0a3a09908d5d924d9ecf95
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 14 10:31:31 2017 +0100

    Adding upstream version 3.6.14.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 5c549db..563b167 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.14 - 2017-03-10
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.13 - 2016-12-17
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 41201b2..3a39bda 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 Copyright (C) 2004-2008 Tiny SPRL.
-Copyright (C) 2007-2016 Cédric Krier.
+Copyright (C) 2007-2017 Cédric Krier.
 Copyright (C) 2007-2013 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 B2CK SPRL.
 Copyright (C) 2011 Openlabs Technologies & Consulting (P) Ltd.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 09a9a36..1b49e3f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.6.13
+Version: 3.6.14
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index 09a9a36..1b49e3f 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.6.13
+Version: 3.6.14
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/__init__.py b/trytond/__init__.py
index a76fe20..64084a1 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -4,7 +4,7 @@ import os
 import time
 from email import charset
 
-__version__ = "3.6.13"
+__version__ = "3.6.14"
 
 os.environ['TZ'] = 'UTC'
 if hasattr(time, 'tzset'):
diff --git a/trytond/backend/mysql/database.py b/trytond/backend/mysql/database.py
index de31da2..7eed7d7 100644
--- a/trytond/backend/mysql/database.py
+++ b/trytond/backend/mysql/database.py
@@ -105,7 +105,7 @@ class Database(DatabaseInterface):
             args['passwd'] = urllib.unquote_plus(uri.password)
         conn = MySQLdb.connect(**args)
         cursor = Cursor(conn, self.database_name)
-        cursor.execute('SET time_zone = `UTC`')
+        cursor.execute('SET time_zone = "+00:00"')
         return cursor
 
     def close(self):
-- 
tryton-server



More information about the tryton-debian-vcs mailing list