Merge lp://qastaging/~mir-team/mir/document-0.26-enhancements-better-again into lp://qastaging/mir
Proposed by
Daniel van Vugt
Status: | Rejected |
---|---|
Rejected by: | Daniel van Vugt |
Proposed branch: | lp://qastaging/~mir-team/mir/document-0.26-enhancements-better-again |
Merge into: | lp://qastaging/mir |
Diff against target: |
49 lines (+18/-19) 1 file modified
debian/changelog (+18/-19) |
To merge this branch: | bzr merge lp://qastaging/~mir-team/mir/document-0.26-enhancements-better-again |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Disapprove | ||
Mir CI Bot | continuous-integration | Approve | |
Review via email:
|
Commit message
changelog: Restore deleted documentation
It got accidentally removed in 3991 for some reason.
Description of the change
Approved and landed already here:
https:/
But then accidentally removed here:
-------
revno: 3991
committer: Cemil Azizoglu <email address hidden>
branch nick: mir
timestamp: Wed 2017-01-25 09:39:21 -0600
message:
Remove markers
-------
To post a comment you must log in.
Unmerged revisions
- 4003. By Daniel van Vugt
-
Try again
- 4002. By Daniel van Vugt
-
Commit
FAILED: Continuous integration, rev:4002 /mir-jenkins. ubuntu. com/job/ mir-ci/ 2904/ /mir-jenkins. ubuntu. com/job/ build-mir/ 3836/console /mir-jenkins. ubuntu. com/job/ build-0- fetch/3915 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 3905 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 3905 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= zesty/3905 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= zesty/3863 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= zesty/3863/ artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 3863 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 3863/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= zesty/3863 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= zesty/3863/ artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 3863/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 3863/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 3863 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 3863/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 3863 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 3863/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 2904/rebuild
https:/