Bazaar

Merge lp:~vila/bzr/prepare-2.0.6 into lp:bzr/2.0

  1. prepare-2.0.6
  2. Merge into 2.0
Proposed by Vincent Ladeuil
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 4760
Proposed branch: lp:~vila/bzr/prepare-2.0.6
Merge into: lp:bzr/2.0
Diff against target: 42 lines (+7/-3)
3 files modified
NEWS (+5/-1)
bzr (+1/-1)
bzrlib/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~vila/bzr/prepare-2.0.6
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+35779@code.launchpad.net

Commit message

Release 2.0.6.

Description of the change

Release 2.0.6.

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

+1

Revision history for this message
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2010-09-10 05:07:49 +0000
3+++ NEWS 2010-09-17 06:09:28 +0000
4@@ -9,7 +9,11 @@
5 bzr 2.0.6
6 #########
7
8-:2.0.6: NOT RELEASED YET
9+:2.0.6: 2010-09-17
10+
11+The sixth release in our 2.0 series addresses several user-inconvenience
12+bugs. None are critical, but upgrading is recommended for all users on
13+earlier 2.0 releases.
14
15 Bug Fixes
16 *********
17
18=== modified file 'bzr'
19--- bzr 2010-03-23 06:55:16 +0000
20+++ bzr 2010-09-17 06:09:28 +0000
21@@ -23,7 +23,7 @@
22 import warnings
23
24 # update this on each release
25-_script_version = (2, 0, 5)
26+_script_version = (2, 0, 6)
27
28 if __doc__ is None:
29 print "bzr does not support python -OO."
30
31=== modified file 'bzrlib/__init__.py'
32--- bzrlib/__init__.py 2010-03-23 07:01:02 +0000
33+++ bzrlib/__init__.py 2010-09-17 06:09:28 +0000
34@@ -50,7 +50,7 @@
35 # Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
36 # releaselevel of 'dev' for unreleased under-development code.
37
38-version_info = (2, 0, 5, 'final', 0)
39+version_info = (2, 0, 6, 'final', 0)
40
41 # API compatibility version: bzrlib is currently API compatible with 1.15.
42 api_minimum_version = (1, 17, 0)

Subscribers

People subscribed via source and target branches