Merge lp://staging/~marcoceppi/charms/precise/chamilo/unit-tests into lp://staging/~johnsca/charms/precise/chamilo/services-framework
Proposed by
Marco Ceppi
| Status: | Merged |
|---|---|
| Merged at revision: | 12 |
| Proposed branch: | lp://staging/~marcoceppi/charms/precise/chamilo/unit-tests |
| Merge into: | lp://staging/~johnsca/charms/precise/chamilo/services-framework |
| Diff against target: |
268 lines (+191/-26) 5 files modified
.bzrignore (+3/-0) Makefile (+60/-0) hooks/actions.py (+27/-25) hooks/services.py (+2/-1) tests/test_actions.py (+99/-0) |
| To merge this branch: | bzr merge lp://staging/~marcoceppi/charms/precise/chamilo/unit-tests |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Cory Johns | Pending | ||
|
Review via email:
|
|||
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
