Ubuntu UI Toolkit

Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/test_jenkins_7_success into lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/jenkins-test

  1. test_jenkins_7_success
  2. Merge into jenkins-test
Proposed by Timo Jyrinki
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 1807
Merged at revision: 1808
Proposed branch: lp:~timo-jyrinki/ubuntu-ui-toolkit/test_jenkins_7_success
Merge into: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/jenkins-test
Diff against target: 19 lines (+2/-2)
1 file modified
ubuntu-sdk.pro (+2/-2)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/test_jenkins_7_success
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Ubuntu SDK team Pending
Review via email: mp+282756@code.launchpad.net

Commit message

this another test commit message that should be included in the merge.

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1807
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/45/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/115/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/45/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1807
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/43/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/116/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/43/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1807
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/47/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/121/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/47/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1807
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/45/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/122/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/45/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ubuntu-sdk.pro'
--- ubuntu-sdk.pro 2016-01-15 11:45:04 +0000
+++ ubuntu-sdk.pro 2016-01-15 13:45:18 +0000
@@ -1,5 +1,5 @@
1#include( documentation/documentation.pri )1#include( documentation/documentation.pri )
2 2
3BUILD_PATH_CONTENTS="SRC_DIR=\"$$PWD\"" \3BUILD_PATH_CONTENTS="SRC_DIR=\"$$PWD\"" \
4 "BUILD_DIR=\"$$OUT_PWD\""4 "BUILD_DIR=\"$$OUT_PWD\""
55
@@ -7,7 +7,7 @@
77
8requires(qtHaveModule(quick))8requires(qtHaveModule(quick))
9load(qt_parts)9load(qt_parts)
1010
11SUBDIRS += po documentation app-launch-profiler ubuntu-ui-toolkit-launcher apicheck11SUBDIRS += po documentation app-launch-profiler ubuntu-ui-toolkit-launcher apicheck
1212
13sub_tests.CONFIG -= no_default_target13sub_tests.CONFIG -= no_default_target

Subscribers

People subscribed via source and target branches

to all changes: