Rev 4845: (lifeless) Release 2.1.2. (Robert Collins) in file:///home/pqm/archives/thelove/bzr/2.1/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.1/

------------------------------------------------------------
revno: 4845 [merge]
revision-id: pqm at pqm.ubuntu.com-20100527165824-blsinv7oywcaezy7
parent: pqm at pqm.ubuntu.com-20100527075411-m4cm3or5cnu98mwu
parent: robertc at robertcollins.net-20100527162312-df6rcq52rspnc1wz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Thu 2010-05-27 17:58:24 +0100
message:
  (lifeless) Release 2.1.2. (Robert Collins)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2010-05-26 02:19:33 +0000
+++ b/NEWS	2010-05-27 16:23:12 +0000
@@ -8,7 +8,11 @@
 bzr 2.1.2
 #########
 
-:2.1.2: NOT RELEASED YET
+:2.1.2: 2010-05-28
+
+This release fixes two critical networking issues with older servers and
+with interrupted system call errors when pushing or pulling.  We recommend
+upgrading to anyone running a 2.1.x version of bzr.
 
 Bug Fixes
 *********

=== modified file 'bzr'
--- a/bzr	2010-04-15 08:50:40 +0000
+++ b/bzr	2010-05-27 16:23:12 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 1, 1)
+_script_version = (2, 1, 2)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2010-04-15 08:50:40 +0000
+++ b/bzrlib/__init__.py	2010-05-27 16:23:12 +0000
@@ -44,7 +44,7 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-version_info = (2, 1, 1, 'final', 0)
+version_info = (2, 1, 2, 'final', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.15.
 api_minimum_version = (2, 1, 0)