Merge lp://staging/~ci-train-staging-area/bileto/testing-train-please-ignore into lp://staging/~ci-train-staging-area/bileto/trunk-copy-please-ignore
Proposed by
Robert Bruce Park
| Status: | Merged |
|---|---|
| Merged at revision: | 535 |
| Proposed branch: | lp://staging/~ci-train-staging-area/bileto/testing-train-please-ignore |
| Merge into: | lp://staging/~ci-train-staging-area/bileto/trunk-copy-please-ignore |
| Diff against target: |
803 lines (+305/-156) 14 files modified
bileto/actions.py (+8/-2) bileto/models.py (+3/-4) bileto/static/index.html (+3/-3) bileto/streams.py (+1/-1) bileto/worker/manager.py (+85/-19) bileto/worker/merge.py (+11/-0) bileto/worker/package.py (+9/-34) bileto/worker/vcs.py (+1/-1) scripts/vcs.sh (+20/-4) tests/test_actions.py (+10/-3) tests/test_login.py (+1/-1) tests/test_worker_manager.py (+114/-47) tests/test_worker_merge.py (+38/-0) tests/test_worker_package.py (+1/-37) |
| To merge this branch: | bzr merge lp://staging/~ci-train-staging-area/bileto/testing-train-please-ignore |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| CI Train Staging PPAs | Pending | ||
|
Review via email:
|
|||
Commit message
Testing merges to trunk.
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
