[tryton-debian-vcs] tryton-server branch debian-wheezy-2.2 updated. debian/2.2.13-1-2-ga4f181b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 17 12:42:46 UTC 2014
The following commit has been merged in the debian-wheezy-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/2.2.13-1-2-ga4f181b
commit a4f181b9051da0d9fe2b4b0a6f82aa014a4ebe5f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 17 14:42:37 2014 +0200
Releasing debian version 2.2.14-1.
diff --git a/debian/changelog b/debian/changelog
index 51466f6..5fbffd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (2.2.14-1) unstable; urgency=medium
+
+ * Merging upstream version 2.2.14.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 17 Apr 2014 14:38:05 +0200
+
tryton-server (2.2.13-1) unstable; urgency=medium
* Merging upstream version 2.2.13.
commit acf18836244723966512e7efdcb9f17bd5e24ffe
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 17 14:35:52 2014 +0200
Merging upstream version 2.2.14.
diff --git a/CHANGELOG b/CHANGELOG
index 1d17e8d..c00592f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.14 - 2014-04-07
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.13 - 2014-03-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index fcd9281..cb7fe4b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 2.2.13
+Version: 2.2.14
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index fcd9281..cb7fe4b 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.2.13
+Version: 2.2.14
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/trytond/transaction.py b/trytond/transaction.py
index 2cd1952..8dffab6 100644
--- a/trytond/transaction.py
+++ b/trytond/transaction.py
@@ -96,7 +96,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 a91aa12..b4e9c80 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,7 +1,7 @@
#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.2.13"
+VERSION = "2.2.14"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-server
More information about the tryton-debian-vcs
mailing list