Merge lp://qastaging/~yolanda.robla/ubuntu/saucy/squid3/fix-ftp into lp://qastaging/ubuntu/saucy/squid3
Proposed by
Yolanda Robla
| Status: | Merged |
|---|---|
| Approved by: | Martin Pitt |
| Approved revision: | 50 |
| Merged at revision: | 49 |
| Proposed branch: | lp://qastaging/~yolanda.robla/ubuntu/saucy/squid3/fix-ftp |
| Merge into: | lp://qastaging/ubuntu/saucy/squid3 |
| Diff against target: |
96 lines (+20/-7) 5 files modified
debian/changelog (+6/-0) debian/tests/control (+1/-1) debian/tests/squid (+4/-0) debian/tests/test-squid.py (+7/-5) debian/tests/testlib_httpd.py (+2/-1) |
| To merge this branch: | bzr merge lp://qastaging/~yolanda.robla/ubuntu/saucy/squid3/fix-ftp |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt | Approve | ||
|
Review via email:
|
|||
Description of the change
Updating ftp tests
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
Thanks! Merged with a meaningful changelog and fixing the "irectory" typo.