Online Accounts: Sign-on daemon

Merge lp://staging/~mardy/signon/packaging into lp://staging/signon

packaging
Merge into trunk

Proposed by Alberto Mardegan on 2014-01-13

Status:

Merged

Approved by:

Ken VanDine on 2014-01-13

Approved revision:

no longer in the source branch.

Merged at revision:

611

Proposed branch:

lp://staging/~mardy/signon/packaging

Merge into:

lp://staging/signon

Diff against target:

16 lines (+3/-3)

1 file modified

src/signond/signonidentity.cpp (+3/-3)

To merge this branch:

bzr merge lp://staging/~mardy/signon/packaging

Related bugs:

Bug #1156776: signon-plugin-oauth2-0.15 fails to build	Low	Fix Committed
Bug #1237782: Remove architecture-dependent patches	Undecided	Fix Released
Bug #1258578: /usr/bin/signond:4:QListData::shared_null:qDeleteAll:qDeleteAll:SignonDaemonNS::SignonSessionCore::destroy:SignonDaemonNS::SignonDisposable::destroyUnused	Undecided	Fix Released
Bug #1267805: signon tests failing when built against Qt 5.2	Critical	Fix Released
Bug #1343556: Signon error at startup	Undecided	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-01-13
Ken VanDine		2014-01-13	Approve on 2014-01-13
Review via email: mp+201457@code.staging.launchpad.net

Commit message

Fix tests for Qt 5.2

Merge from upstream.

Description of the change

Fix tests for Qt 5.2

Merge from upstream.

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-01-13:

#

looks good

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-13:

#

PASSED: Continuous integration, rev:611
http://jenkins.qa.ubuntu.com/job/signon-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-trusty-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-trusty-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/signon-trusty-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/signon-ci/48/rebuild

review: Approve (continuous-integration)

lp://staging/~mardy/signon/packaging updated on 2014-01-13

611. By Alberto Mardegan on 2014-01-13

Fix tests for Qt 5.2

Merge from upstream. Fixes: https://bugs.launchpad.net/bugs/1156776, https://bugs.launchpad.net/bugs/1237782, https://bugs.launchpad.net/bugs/1258578, https://bugs.launchpad.net/bugs/1267805.

Approved by PS Jenkins bot, Ken VanDine.

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

to all changes:

Alberto Mardegan