Mir

Merge lp://qastaging/mir/0.24 into lp://qastaging/mir

  1. 0.24
  2. Merge into development-branch
Proposed by Andreas Pokorny
Status: Superseded
Proposed branch: lp://qastaging/mir/0.24
Merge into: lp://qastaging/mir
Diff against target: 164 lines (+54/-7) (has conflicts)
8 files modified
CMakeLists.txt (+2/-2)
debian/changelog (+18/-0)
src/common/symbols.map (+3/-0)
src/platform/symbols.map (+1/-1)
src/platforms/CMakeLists.txt (+5/-0)
src/server/symbols.map (+4/-0)
tests/CMakeLists.txt (+19/-2)
tests/acceptance-tests/test_prompt_session_client_api.cpp (+2/-2)
Text conflict in debian/changelog
Text conflict in src/common/symbols.map
Text conflict in src/platforms/CMakeLists.txt
Text conflict in src/server/symbols.map
Text conflict in tests/CMakeLists.txt
To merge this branch: bzr merge lp://qastaging/mir/0.24
Reviewer Review Type Date Requested Status
Daniel van Vugt Needs Resubmitting
Mir CI Bot continuous-integration Needs Fixing
Review via email: mp+306843@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2016-09-27.

Commit message

mir 0.24.1 release

Description of the change

0.24.1

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3634
https://mir-jenkins.ubuntu.com/job/mir-ci/1821/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2284/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2347/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2338/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2338/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2338/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2311/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2311/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2311/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2311/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2311/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1821/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Wrong target branch. You mean lp:mir/ubuntu

review: Needs Resubmitting
lp://qastaging/mir/0.24 updated
3635. By Daniel van Vugt

debian/changelog: Fix up version format

Remember we're releasing Mir-for-Ubuntu and not a definitive one
release for all distros.

3636. By Daniel van Vugt

Cherry pick r3625 from lp:mir (LP: #1609612 fix 1 of 3)

3637. By Daniel van Vugt

Cherry pick r3635 from lp:mir (LP: #1609612 fix 2 of 3)

3638. By Daniel van Vugt

Mention LP: #1609612 in the changelog

3639. By Daniel van Vugt

Cherry pick r3656 from lp:mir to fix CI failures (and a potential
crash) (LP: #1612012)

3640. By Daniel van Vugt

Mention LP: #1612012 in the changelog

3641. By Andreas Pokorny

cherry picked bug fix from lp:mir

3642. By Daniel van Vugt

Next version (if any) would be 0.24.2

3643. By Daniel van Vugt

Merge final 0.24.1+16.10.20160928-0ubuntu1 changelog from Ubuntu

3644. By Daniel van Vugt

Fix zesty build failures: Structures which contain variable-length
arrays can only be instantiated correctly using dynamic memory
allocation (LP: #1638774)

3645. By Daniel van Vugt

Add a changelog entry for 0.24.2

Unmerged revisions

3645. By Daniel van Vugt

Add a changelog entry for 0.24.2

3644. By Daniel van Vugt

Fix zesty build failures: Structures which contain variable-length
arrays can only be instantiated correctly using dynamic memory
allocation (LP: #1638774)

3643. By Daniel van Vugt

Merge final 0.24.1+16.10.20160928-0ubuntu1 changelog from Ubuntu

3642. By Daniel van Vugt

Next version (if any) would be 0.24.2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches