[tryton-debian-vcs] tryton-server branch upstream-2.6 updated. upstream/2.6.10-1-gb56015e
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 17 12:29:52 UTC 2014
The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=upstream/2.6.10-1-gb56015e
commit b56015ed604de7973f5489ed6ff6f923b9cc47e2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 17 14:02:38 2014 +0200
Adding upstream version 2.6.11.
diff --git a/CHANGELOG b/CHANGELOG
index a2e8643..54694c9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.11 - 2014-04-07
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.10 - 2014-03-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 694b358..b347cae 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 2.6.10
+Version: 2.6.11
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 694b358..b347cae 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 2.6.10
+Version: 2.6.11
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond/transaction.py b/trytond/transaction.py
index 39cd370..4ba1850 100644
--- a/trytond/transaction.py
+++ b/trytond/transaction.py
@@ -100,7 +100,8 @@ class Transaction(local):
def set_context(self, context=None, **kwargs):
if context is None:
context = {}
- manager = _AttributeManager(context=self.context.copy())
+ manager = _AttributeManager(context=self.context)
+ self.context = self.context.copy()
self.context.update(context)
if kwargs:
self.context.update(kwargs)
diff --git a/trytond/version.py b/trytond/version.py
index ad3283c..3feb23c 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "trytond"
-VERSION = "2.6.10"
+VERSION = "2.6.11"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-server
More information about the tryton-debian-vcs
mailing list