Merge lp://staging/~repowerd-team/repowerd/trunk-for-ci-train into lp://staging/~repowerd-team/repowerd/ci-train
Proposed by
Alexandros Frantzis
| Status: | Merged |
|---|---|
| Approved by: | Alexandros Frantzis |
| Approved revision: | 182 |
| Merged at revision: | 164 |
| Proposed branch: | lp://staging/~repowerd-team/repowerd/trunk-for-ci-train |
| Merge into: | lp://staging/~repowerd-team/repowerd/ci-train |
| Diff against target: |
531 lines (+270/-10) 13 files modified
CMakeLists.txt (+1/-1) debian/changelog (+10/-0) src/core/daemon_config.h (+1/-0) src/core/default_state_machine.cpp (+57/-6) src/core/default_state_machine.h (+11/-2) src/default_daemon_config.cpp (+6/-0) src/default_daemon_config.h (+1/-0) src/tools/cli.cpp (+90/-0) tests/core-tests/acceptance_test.cpp (+3/-1) tests/core-tests/acceptance_test.h (+1/-0) tests/core-tests/daemon_config.cpp (+6/-0) tests/core-tests/daemon_config.h (+1/-0) tests/core-tests/test_notification.cpp (+82/-0) |
| To merge this branch: | bzr merge lp://staging/~repowerd-team/repowerd/trunk-for-ci-train |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Repowerd development team | Pending | ||
|
Review via email:
|
|||
Commit message
2016.08.3
Description of the change
2016.08.3
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
