loggerhead

Merge lp:~jelmer/loggerhead/merge-1.18.1 into lp:loggerhead

  1. merge-1.18.1
  2. Merge into trunk-rich
Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 457
Proposed branch: lp:~jelmer/loggerhead/merge-1.18.1
Merge into: lp:loggerhead
Diff against target: 38 lines (+11/-3)
2 files modified
NEWS (+10/-2)
loggerhead/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/loggerhead/merge-1.18.1
Reviewer Review Type Date Requested Status
Loggerhead Reviewers Pending
Review via email: mp+74536@code.launchpad.net

This proposal supersedes a proposal from 2011-09-07.

Description of the change

Merge in the 1.18 branch, for the right changelog entries.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

Seems straightforward.

merge: approve

John
=:->
On Sep 8, 2011 1:35 AM, "Jelmer Vernooij" <email address hidden> wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/loggerhead/merge-1.18.1
 into lp:loggerhead.
>
> Requested reviews:
> Loggerhead Reviewers (loggerhead-reviewers)
>
> For more details, see:
> https://code.launchpad.net/~jelmer/loggerhead/merge-1.18.1/+merge/74536
>
> Merge in the 1.18 branch, for the right changelog entries.
> --
> https://code.launchpad.net/~jelmer/loggerhead/merge-1.18.1/+merge/74536
> You are subscribed to branch lp:loggerhead.

Revision history for this message
John A Meinel (jameinel) wrote : Posted in a previous version of this proposal

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

On 09/08/2011 01:37 AM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:loggerhead/1.18 into lp:loggerhead.
>
> Requested reviews:
> Loggerhead Reviewers (loggerhead-reviewers)
> Related bugs:
> Bug #673999 in loggerhead: "missing import logging.handlers in start-loggerhead"
> https://bugs.launchpad.net/loggerhead/+bug/673999
> Bug #740142 in loggerhead: "persistent xss vector in (unescaped) filenames in revision views "
> https://bugs.launchpad.net/loggerhead/+bug/740142
>
> For more details, see:
> https://code.launchpad.net/~loggerhead-team/loggerhead/1.18/+merge/74532
>
> Merge in the 1.18 branch, for the right changelog entries.

 merge: approve
John
=:->

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

iEYEARECAAYFAk5odaAACgkQJdeBCYSNAAPyKACgwVS/dKagFCUlGfWzwdPk3B/P
tSsAnRNn8AJh/Lu85KLs/Tze7youyxve
=kZBo
-----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 'NEWS'
2--- NEWS 2011-03-25 11:38:43 +0000
3+++ NEWS 2011-09-08 00:35:26 +0000
4@@ -39,11 +39,19 @@
5 Improves performance on projects with long histories like emacs.
6 (John Arbash Meinel)
7
8+ - Fix support for displaying foreign revision ids.
9+ (Jelmer Vernooij, #736026)
10+
11+
12+1.18.1 [24Mar2011]
13+------------------
14+
15 - Fix escaping of filenames in revision views.
16 (William Grant, #740142)
17
18- - Fix support for displaying foreign revision ids.
19- (Jelmer Vernooij, #736026)
20+ - Add missing import to loggerhead.trace, allowing start-loggerhead
21+ to run when a log.roll config option is set.
22+ (Max Kanat-Alexander, #673999)
23
24
25 1.18 [10Nov2010]
26
27=== modified file 'loggerhead/__init__.py'
28--- loggerhead/__init__.py 2010-11-11 03:30:43 +0000
29+++ loggerhead/__init__.py 2011-09-08 00:35:26 +0000
30@@ -22,7 +22,7 @@
31
32 import pkg_resources
33
34-__version__ = '1.18'
35+__version__ = '1.18.1'
36 required_bzrlib = (1, 17)
37
38 pkg_resources.get_distribution('Paste>=1.6')

Subscribers

People subscribed via source and target branches