Rev 4831: (mbp) prepare 2.1.1 in file:///home/pqm/archives/thelove/bzr/2.1/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4831 [merge]
revision-id: pqm at pqm.ubuntu.com-20100324075819-z4a2tyb98hr4n6uz
parent: pqm at pqm.ubuntu.com-20100324062826-a6jnn6hyvtaqwurj
parent: mbp at canonical.com-20100324071335-xvgdmwdsboz02tc0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Wed 2010-03-24 07:58:19 +0000
message:
  (mbp) prepare 2.1.1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2010-03-23 06:45:56 +0000
+++ b/NEWS	2010-03-24 07:13:35 +0000
@@ -9,7 +9,10 @@
 bzr 2.1.1
 #########
 
-:2.1.1: not released yet
+:2.1.1: 2010-03-24
+
+This is a small bugfix release.  Upgrading is recommended for anyone
+running 2.1.0 or earlier.
 
 Bug Fixes
 *********
@@ -43,7 +46,6 @@
   ``StaticTuple`` extensions, rather than having the build fail randomly.
   (John Arbash Meinel, #449776)
 
-
 Documentation
 *************
 

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2010-03-04 04:56:49 +0000
+++ b/bzrlib/__init__.py	2010-03-24 07:13:35 +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, 'dev', 0)
+version_info = (2, 1, 1, 'final', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.15.
 api_minimum_version = (2, 1, 0)