bzr-website

Merge lp:~bialix/bzr-website/2.2 into lp:bzr-website

  1. 2.2
  2. Merge into trunk
Proposed by Alexander Belchenko
Status: Merged
Approved by: John A Meinel
Approved revision: 171
Merged at revision: 171
Proposed branch: lp:~bialix/bzr-website/2.2
Merge into: lp:bzr-website
Prerequisite: lp:~bialix/bzr-website/2.1.2
Diff against target: 45 lines (+6/-6)
2 files modified
build.py (+2/-2)
en/index.html (+4/-4)
To merge this branch: bzr merge lp:~bialix/bzr-website/2.2
Reviewer Review Type Date Requested Status
John A Meinel Approve
Martin Pool (community) Approve
Review via email: mp+34046@code.launchpad.net

Description of the change

This patch updates stable bzr version in the header to 2.2

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

It's a bit annoying it's not expressed only once, but this is definitely an improvement: thanks.

review: Approve
Revision history for this message
Alexander Belchenko (bialix) wrote :

Martin Pool пишет:
> Review: Approve
> It's a bit annoying it's not expressed only once, but this is definitely an improvement: thanks.

What do you mean by "it's not expressed only once"?

Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 8/30/2010 2:09 AM, Alexander Belchenko wrote:
> Alexander Belchenko has proposed merging lp:~bialix/bzr-website/2.2 into lp:bzr-website with lp:~bialix/bzr-website/2.1.2 as a prerequisite.
>
> Requested reviews:
> Bazaar Developers (bzr)
>
>
> This patch updates stable bzr version in the header to 2.2

 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkx7vTAACgkQJdeBCYSNAANG8ACfYIkdqVdICCAXdvuYVo05uJuX
kA4AoL5200pBvuBSUcO6MX2+HB5GyvX8
=W6Jw
-----END PGP SIGNATURE-----

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build.py'
2--- build.py 2010-08-30 07:09:41 +0000
3+++ build.py 2010-08-30 07:09:41 +0000
4@@ -3,8 +3,8 @@
5 import time
6 import feedparser
7
8-STABLE_VERSION = "2.1.2"
9-TEST_VERSION = "2.2b4"
10+STABLE_VERSION = "2.2"
11+TEST_VERSION = "(not available)"
12
13
14 PROJECTS = [
15
16=== modified file 'en/index.html'
17--- en/index.html 2010-08-30 07:09:41 +0000
18+++ en/index.html 2010-08-30 07:09:41 +0000
19@@ -78,8 +78,8 @@
20 <div class="grid_4">
21 <h1 id="page_title"><a href=".">Bazaar</a></h1>
22 <table>
23- <tr><th align="left">Stable version:&nbsp;</th><td>2.1.2</td></tr>
24- <tr><th align="left">Test version:&nbsp;</th><td>2.2b4</td></tr>
25+ <tr><th align="left">Stable version:&nbsp;</th><td>2.2</td></tr>
26+ <tr><th align="left">Test version:&nbsp;</th><td>(not available)</td></tr>
27 </table>
28 </div>
29 <div class="grid_4 omega" id="carousel">
30@@ -167,14 +167,14 @@
31
32 <h2><a href="https://launchpad.net/bazaar/+announcements">Community News</a> <a title="Atom 1.0 feed" href="http://feeds.launchpad.net/bazaar/announcements.atom"><img src="../bzricons/rss.png" /></a></h2>
33
34+ <p class="readmore">30-Aug-2010: <a href="https://launchpad.net/bzr-externals/+announcement/6630"><span>Bazaar Externals plugin 1.3.2 released</span></a></p>
35+
36 <p class="readmore">20-Aug-2010: <a href="https://launchpad.net/bzr-tfs/+announcement/6561"><span>bzr-tfs 0.2 released</span></a></p>
37
38 <p class="readmore">13-Aug-2010: <a href="https://launchpad.net/trac-bzr/+announcement/6518"><span>trac-bzr 0.4.1 released</span></a></p>
39
40 <p class="readmore">10-Aug-2010: <a href="https://launchpad.net/trac-bzr/+announcement/6485"><span>trac-bzr 0.4.0 released</span></a></p>
41
42- <p class="readmore">05-Aug-2010: <a href="https://launchpad.net/qbzr/+announcement/6454"><span>QBzr 0.19 final released</span></a></p>
43-
44
45 <h2><a href="https://launchpad.net/bzr/+announcements">Core News</a> <a title="Atom 1.0 feed" href="http://feeds.launchpad.net/bzr/announcements.atom"><img src="../bzricons/rss.png" /></a></h2>
46

Subscribers

People subscribed via source and target branches