Bazaar

Merge lp:~denys.duchier/bzr/bug-392401 into lp:~bzr/bzr/trunk-old

  1. bug-392401
  2. Merge into trunk-old
Proposed by Denys Duchier
Status: Merged
Merged at revision: not available
Proposed branch: lp:~denys.duchier/bzr/bug-392401
Merge into: lp:~bzr/bzr/trunk-old
Diff against target: 12 lines
To merge this branch: bzr merge lp:~denys.duchier/bzr/bug-392401
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
John A Meinel Approve
Review via email: mp+10158@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Denys Duchier (denys.duchier) wrote :

install keys and certs for test suite. fixes bug #392401.

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

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

Denys Duchier wrote:
> Denys Duchier has proposed merging lp:~denys.duchier/bzr/bug-392401 into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> install keys and certs for test suite. fixes bug #392401.
>

 review: approve

John
=:->

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

iEYEARECAAYFAkqFd8cACgkQJdeBCYSNAAOzrQCdEgGZlHPOSaD1N5dF8RtoZBqw
6CcAn1L4FaIYxaDQQEJNB+Uoz0Kz0mPj
=97Nq
-----END PGP SIGNATURE-----

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

This looks good, thanks for looking into it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2009-08-04 15:21:43 +0000
3+++ setup.py 2009-08-14 15:35:33 +0000
4@@ -65,6 +65,9 @@
5 'package_data': {'bzrlib': ['doc/api/*.txt',
6 'tests/test_patches_data/*',
7 'help_topics/en/*.txt',
8+ 'tests/ssl_certs/server_without_pass.key',
9+ 'tests/ssl_certs/server_with_pass.key',
10+ 'tests/ssl_certs/server.crt'
11 ]},
12 }
13