Merge lp://staging/~thomas-voss/location-service/expose-engine-state-information into lp://staging/location-service/trunk
Proposed by
Thomas Voß
Status: | Merged |
---|---|
Approved by: | Marcus Tomlinson |
Approved revision: | 249 |
Merged at revision: | 252 |
Proposed branch: | lp://staging/~thomas-voss/location-service/expose-engine-state-information |
Merge into: | lp://staging/location-service/trunk |
Diff against target: |
1022 lines (+597/-61) 19 files modified
include/location_service/com/ubuntu/location/codec.h (+45/-0) include/location_service/com/ubuntu/location/service/interface.h (+24/-0) include/location_service/com/ubuntu/location/service/skeleton.h (+8/-0) include/location_service/com/ubuntu/location/service/state.h (+43/-0) include/location_service/com/ubuntu/location/service/stub.h (+2/-0) src/location_service/com/ubuntu/location/CMakeLists.txt (+2/-0) src/location_service/com/ubuntu/location/engine.cpp (+19/-21) src/location_service/com/ubuntu/location/engine.h (+4/-14) src/location_service/com/ubuntu/location/service/daemon.cpp (+13/-0) src/location_service/com/ubuntu/location/service/daemon.h (+3/-0) src/location_service/com/ubuntu/location/service/implementation.cpp (+31/-6) src/location_service/com/ubuntu/location/service/skeleton.cpp (+33/-0) src/location_service/com/ubuntu/location/service/state.cpp (+71/-0) src/location_service/com/ubuntu/location/service/stub.cpp (+7/-0) src/location_service/com/ubuntu/location/state_tracking_provider.h (+162/-0) tests/CMakeLists.txt (+1/-0) tests/daemon_and_cli_tests.cpp (+10/-0) tests/engine_test.cpp (+0/-20) tests/state_tracking_provider_test.cpp (+119/-0) |
To merge this branch: | bzr merge lp://staging/~thomas-voss/location-service/expose-engine-state-information |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marcus Tomlinson (community) | Approve | ||
Scott Sweeny (community) | Approve | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email:
|
Commit message
Expose service::State to the bus.
Description of the change
Expose service::State to the bus.
To post a comment you must log in.
LGTM