Merge lp://qastaging/mir/0.12 into lp://qastaging/mir/ubuntu
Proposed by
Alexandros Frantzis
Status: | Merged | ||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Alexandros Frantzis | ||||||||||||||||||||||||||||||||
Approved revision: | 2308 | ||||||||||||||||||||||||||||||||
Merged at revision: | 1225 | ||||||||||||||||||||||||||||||||
Proposed branch: | lp://qastaging/mir/0.12 | ||||||||||||||||||||||||||||||||
Merge into: | lp://qastaging/mir/ubuntu | ||||||||||||||||||||||||||||||||
Diff against target: |
2349 lines (+1697/-127) 23 files modified
3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp (+36/-31) cmake/MirCommon.cmake (+2/-0) debian/changelog (+22/-0) src/CMakeLists.txt (+1/-1) src/platforms/android/server/hwc_blanking_control.cpp (+14/-1) src/platforms/mesa/server/cursor.cpp (+31/-3) src/server/frontend/protobuf_message_processor.cpp (+42/-15) src/server/frontend/protobuf_message_processor.h (+2/-1) src/server/frontend/protobuf_responder.cpp (+9/-5) src/server/frontend/protobuf_responder.h (+2/-0) src/server/frontend/session_mediator.cpp (+25/-26) src/server/frontend/session_mediator.h (+2/-0) src/server/frontend/surface_tracker.cpp (+8/-1) src/server/frontend/surface_tracker.h (+6/-3) src/server/graphics/software_cursor.cpp (+8/-20) src/server/graphics/software_cursor.h (+1/-1) tests/acceptance-tests/throwback/test_client_input.cpp (+3/-2) tests/unit-tests/frontend/test_protobuf_message_processor.cpp (+1/-1) tests/unit-tests/graphics/android/test_hwc_configuration.cpp (+28/-13) tests/unit-tests/graphics/test_software_cursor.cpp (+20/-0) tests/unit-tests/test_fatal.cpp (+3/-3) tools/valgrind_suppressions_armhf (+27/-0) tools/valgrind_suppressions_glibc_2.21 (+1404/-0) |
||||||||||||||||||||||||||||||||
To merge this branch: | bzr merge lp://qastaging/mir/0.12 | ||||||||||||||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Mir development team | Pending | ||
Review via email:
|
Commit message
Release 0.12.1
Description of the change
Release 0.12.1
To post a comment you must log in.
FAILED: Continuous integration, rev:2304 jenkins. qa.ubuntu. com/job/ mir-ubuntu- ci/41/ jenkins. qa.ubuntu. com/job/ mir-android- vivid-i386- build/1717 jenkins. qa.ubuntu. com/job/ mir-clang- vivid-amd64- build/1716/ console jenkins. qa.ubuntu. com/job/ mir-ubuntu- vivid-amd64- ci/26 jenkins. qa.ubuntu. com/job/ mir-ubuntu- vivid-amd64- ci/26/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-ubuntu- vivid-armhf- ci/29 jenkins. qa.ubuntu. com/job/ mir-ubuntu- vivid-armhf- ci/29/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- ubuntu- ci/41/rebuild
http://