Merge lp://qastaging/~vanvugt/mir/revert-r931 into lp://qastaging/~mir-team/mir/trunk
Proposed by
Daniel van Vugt
| Status: | Merged |
|---|---|
| Approved by: | Daniel van Vugt |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 933 |
| Proposed branch: | lp://qastaging/~vanvugt/mir/revert-r931 |
| Merge into: | lp://qastaging/~mir-team/mir/trunk |
| Diff against target: |
2098 lines (+209/-897) 43 files modified
include/client/mir_toolkit/mir_client_library.h (+0/-11) include/platform/mir/graphics/display_configuration.h (+0/-5) include/server/mir/frontend/event_sink.h (+0/-5) include/shared/mir_toolkit/client_types.h (+0/-9) include/test/mir_test/display_config_matchers.h (+28/-83) include/test/mir_test_doubles/null_event_sink.h (+0/-1) include/test/mir_test_doubles/stub_display_configuration.h (+0/-95) src/client/connection_configuration.h (+0/-2) src/client/default_connection_configuration.cpp (+1/-11) src/client/default_connection_configuration.h (+0/-2) src/client/display_configuration.cpp (+29/-95) src/client/display_configuration.h (+2/-32) src/client/mir_client_library.cpp (+2/-9) src/client/mir_connection.cpp (+5/-8) src/client/mir_connection.h (+0/-5) src/client/rpc/make_rpc_channel.h (+0/-2) src/client/rpc/make_socket_rpc_channel.cpp (+1/-2) src/client/rpc/mir_socket_rpc_channel.cpp (+2/-11) src/client/rpc/mir_socket_rpc_channel.h (+0/-3) src/server/frontend/event_sender.cpp (+10/-31) src/server/frontend/event_sender.h (+0/-7) src/server/frontend/protobuf_buffer_packer.cpp (+0/-30) src/server/frontend/protobuf_buffer_packer.h (+0/-6) src/server/frontend/session_mediator.cpp (+24/-2) src/server/graphics/android/android_display.cpp (+1/-2) src/server/graphics/gbm/real_kms_display_configuration.cpp (+2/-5) src/shared/protobuf/mir_protobuf.proto (+4/-6) tests/integration-tests/test_display_info.cpp (+51/-194) tests/mir_test_doubles/test_protobuf_client.cpp (+1/-5) tests/mir_test_framework/testing_server_options.cpp (+1/-2) tests/unit-tests/client/CMakeLists.txt (+0/-1) tests/unit-tests/client/test_client_display_conf.cpp (+0/-78) tests/unit-tests/client/test_mir_connection.cpp (+0/-6) tests/unit-tests/frontend/CMakeLists.txt (+0/-1) tests/unit-tests/frontend/stress_protobuf_communicator.cpp (+1/-5) tests/unit-tests/frontend/test_event_sender.cpp (+0/-68) tests/unit-tests/frontend/test_session_mediator.cpp (+28/-7) tests/unit-tests/frontend/test_session_mediator_gbm.cpp (+7/-3) tests/unit-tests/graphics/gbm/test_gbm_cursor.cpp (+1/-5) tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp (+4/-18) tests/unit-tests/graphics/gbm/test_overlapping_output_grouping.cpp (+1/-3) tests/unit-tests/graphics/test_default_display_configuration_policy.cpp (+2/-16) tests/unit-tests/graphics/test_display_configuration.cpp (+1/-5) |
| To merge this branch: | bzr merge lp://qastaging/~vanvugt/mir/revert-r931 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Robert Ancell | Approve | ||
| Chris Halse Rogers | Approve | ||
|
Review via email:
|
|||
Commit message
Revert r931. It is causing instant and widespread crashes (LP: #1209053)
Description of the change
You don't really need to review this as such. Just diff and verify it is equal to r930.
You might also want to test for the crash :)
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1 on the revert. Starting mir_demo_