Merge lp://staging/~unity-api-team/libusermetrics/read-translations-from-click into lp://staging/libusermetrics
Proposed by
Pete Woods
Status: | Merged |
---|---|
Approved by: | Pete Woods |
Approved revision: | 195 |
Merged at revision: | 189 |
Proposed branch: | lp://staging/~unity-api-team/libusermetrics/read-translations-from-click |
Merge into: | lp://staging/libusermetrics |
Diff against target: |
865 lines (+261/-56) 21 files modified
CMakeLists.txt (+10/-1) data/com.canonical.usermetrics.DataSource.xml (+2/-0) debian/control (+1/-0) src/libusermetricscommon/DateFactory.h (+1/-0) src/libusermetricsoutput/SyncedDataSource.cpp (+2/-2) src/libusermetricsoutput/SyncedDataSource.h (+1/-1) src/libusermetricsoutput/SyncedUserMetricsStore.cpp (+3/-5) src/libusermetricsoutput/SyncedUserMetricsStore.h (+1/-3) src/usermetricsservice/CMakeLists.txt (+6/-2) src/usermetricsservice/DBusDataSet.h (+1/-0) src/usermetricsservice/DBusDataSource.cpp (+9/-2) src/usermetricsservice/DBusDataSource.h (+14/-1) src/usermetricsservice/DBusUserMetrics.cpp (+5/-4) src/usermetricsservice/DBusUserMetrics.h (+5/-1) src/usermetricsservice/TranslationLocator.h (+34/-0) src/usermetricsservice/TranslationLocatorImpl.cpp (+69/-0) src/usermetricsservice/TranslationLocatorImpl.h (+34/-0) src/usermetricsservice/main.cpp (+3/-1) tests/data/valgrind.suppression (+15/-0) tests/integration/libusermetricsoutput/TestUserMetrics.cpp (+3/-3) tests/unit/usermetricsservice/TestUserMetricsService.cpp (+42/-30) |
To merge this branch: | bzr merge lp://staging/~unity-api-team/libusermetrics/read-translations-from-click |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Unity Team | Pending | ||
Review via email: mp+250112@code.staging.launchpad.net |
Commit message
Read translations from click packages
Description of the change
Read translations from click packages
To post a comment you must log in.
FAILED: Continuous integration, rev:192 jenkins. qa.ubuntu. com/job/ libusermetrics- ci/104/ jenkins. qa.ubuntu. com/job/ libusermetrics- vivid-amd64- ci/1/console jenkins. qa.ubuntu. com/job/ libusermetrics- vivid-armhf- ci/1/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/libusermetr ics-ci/ 104/rebuild
http://