Merge lp://staging/~james-w/pkgme/buildout into lp://staging/pkgme
Proposed by
James Westby
| Status: | Merged |
|---|---|
| Approved by: | Jonathan Lange |
| Approved revision: | 134 |
| Merged at revision: | 133 |
| Proposed branch: | lp://staging/~james-w/pkgme/buildout |
| Merge into: | lp://staging/pkgme |
| Diff against target: |
858 lines (+551/-67) 12 files modified
.bzrignore (+6/-0) .testr.conf (+1/-1) Makefile (+18/-0) README.txt (+29/-22) bootstrap.py (+262/-0) buildout.cfg (+36/-0) buildout.mk (+81/-0) distribute_setup.py (+74/-36) setup.py (+0/-1) sphinx.mk (+3/-3) tarmac_tests.sh (+7/-4) versions.cfg (+34/-0) |
| To merge this branch: | bzr merge lp://staging/~james-w/pkgme/buildout |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jonathan Lange | Approve | ||
|
Review via email:
|
|||
Commit message
Re-instate buildout.
Description of the change
Hi,
This re-instates the buildout code for pkgme.
Thanks,
James
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hurrah!