Rev 4879: (vila) Open 2.1.5 for bug fixes (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/2.1/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4879 [merge]
revision-id: pqm at pqm.ubuntu.com-20110517093252-aqguzj7hag840pu5
parent: pqm at pqm.ubuntu.com-20110516180433-fcvrfu4oex8baj4u
parent: v.ladeuil+lp at free.fr-20110517081908-hbrr9xsg0uu893c5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Tue 2011-05-17 09:32:52 +0000
message:
  (vila) Open 2.1.5 for bug fixes (Vincent Ladeuil)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2011-05-16 14:25:58 +0000
+++ b/NEWS	2011-05-17 08:19:08 +0000
@@ -5,11 +5,46 @@
 .. contents:: List of Releases
    :depth: 1
 
+bzr 2.1.5
+#########
+
+:2.1.5: NOT RELEASED YET
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
 bzr 2.1.4
 #########
 
 :2.1.4: 2011-05-16
 
+The fourth release in our 2.1 series addresses some user-inconvenience bugs.
+None are critical, but upgrading is recommended for all users on earlier 2.1
+releases.
+
+
 Compatibility Breaks
 ********************
 
@@ -22,6 +57,8 @@
 New Features
 ************
 
+None.
+
 Bug Fixes
 *********
 

=== modified file 'bzr'
--- a/bzr	2011-05-16 14:25:58 +0000
+++ b/bzr	2011-05-17 08:19:08 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 1, 4)
+_script_version = (2, 1, 5)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2011-05-16 14:25:58 +0000
+++ b/bzrlib/__init__.py	2011-05-17 08:19:08 +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, 4, 'final', 0)
+version_info = (2, 1, 5, 'dev', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.15.
 api_minimum_version = (2, 1, 0)