Merge lp://qastaging/pay-service/devel into lp://qastaging/pay-service/14.10

Proposed by Ted Gould
Status: Merged
Merged at revision: 9
Proposed branch: lp://qastaging/pay-service/devel
Merge into: lp://qastaging/pay-service/14.10
Diff against target: 1627 lines (+946/-91)
35 files modified
.bzrignore (+3/-1)
CMakeLists.txt (+7/-4)
MERGE-REVIEW (+14/-0)
data/pay-service.conf.in (+3/-1)
debian/changelog (+11/-0)
debian/control (+4/-0)
debian/pay-service.click-hook (+5/-0)
debian/rules (+1/-1)
libpay/pay-package.cpp (+35/-3)
service/CMakeLists.txt (+7/-3)
service/dbus-interface.cpp (+7/-1)
service/dbus-interface.h (+2/-0)
service/item-memory.cpp (+24/-26)
service/main.cpp (+20/-19)
service/purchase-ual.cpp (+20/-5)
service/qtbridge.cpp (+189/-0)
service/qtbridge.h (+88/-0)
service/token-grabber-u1.cpp (+113/-0)
service/token-grabber-u1.h (+41/-0)
service/token-grabber.h (+39/-0)
service/verification-curl.cpp (+90/-11)
service/verification-curl.h (+7/-1)
tests/CMakeLists.txt (+20/-4)
tests/click-data/com.canonical.payui/0.1/.click/info/com.canonical.payui.manifest (+9/-0)
tests/click-data/com.canonical.payui/0.1/test.desktop (+3/-0)
tests/click-db/test.conf.in (+2/-0)
tests/dbus-interface-tests.cpp (+24/-2)
tests/libpay-tests.cpp (+5/-5)
tests/manual (+30/-0)
tests/purchase-ual-tests.cpp (+9/-2)
tests/setup-staging.sh (+19/-0)
tests/token-grabber-null.h (+36/-0)
tests/verification-curl-endpoints/good/device-id.in (+5/-0)
tests/verification-curl-endpoints/package-name.in (+3/-0)
tests/verification-curl-tests.cpp (+51/-2)
To merge this branch: bzr merge lp://qastaging/pay-service/devel
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Indicator Applet Developers Pending
Review via email: mp+223106@code.qastaging.launchpad.net

Commit message

Fixes from integration work to make the pay demo come together.

Description of the change

Release prep.

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Marking for review to get Jenkin's opinion. Needs a acceptance test branch before fully ready.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp://qastaging/pay-service/devel updated
14. By Ted Gould

Fix scoping of root objects

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp://qastaging/pay-service/devel updated
15. By Ted Gould

Check to ensure that the package is available to start

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp://qastaging/pay-service/devel updated
16. By Ted Gould

Bringing in tests and merge commit rules

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp://qastaging/pay-service/devel updated
17. By Ted Gould

Ensure that the debian changelog matches the trunk

18. By Ted Gould

Doing the changelog manually for CI Train

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)

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: