Merge lp://staging/~gary/launchpad/bug491705-2 into lp://staging/launchpad
Proposed by
Gary Poster
Status: | Merged |
---|---|
Approved by: | Gary Poster |
Approved revision: | no longer in the source branch. |
Merged at revision: | not available |
Proposed branch: | lp://staging/~gary/launchpad/bug491705-2 |
Merge into: | lp://staging/launchpad |
Prerequisite: | lp://staging/~gary/launchpad/bug491705 |
Diff against target: |
460 lines (+159/-146) 10 files modified
Makefile (+1/-2) bootstrap.py (+149/-113) buildout.cfg (+0/-17) cronscripts/foaf-update-karma-cache.py (+0/-5) cronscripts/parse-ppa-apache-access-logs.py (+1/-1) cronscripts/process-apport-blobs.py (+1/-1) daemons/cache-database-replication-lag.py (+1/-1) scripts/memcached-stats.py (+1/-1) utilities/soyuz-sampledata-setup.py (+2/-2) versions.cfg (+3/-3) |
To merge this branch: | bzr merge lp://staging/~gary/launchpad/bug491705-2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Francis J. Lacoste (community) | Approve | ||
Review via email:
|
Commit message
incorporate new buildout version
Description of the change
Merge branch to incorporate newer buildout with trunk.
Changes:
- Use bootstrap.py copied from already reviewed buildout branch
- Use newer eggs
- Make sure newer scripts use _pythonpath in the new way
To post a comment you must log in.
On IRC, you confirmed that the changes related to the merge conflicts removal are sane with the reference branch.