Merge lp://staging/~dobey/pay-service/log-more into lp://staging/pay-service/14.10
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~dobey/pay-service/log-more |
| Merge into: | lp://staging/pay-service/14.10 |
| Diff against target: |
142 lines (+60/-0) (has conflicts) 3 files modified
service/dbus-interface.cpp (+2/-0) service/purchase-ual.cpp (+3/-0) service/verification-curl.cpp (+55/-0) Text conflict in service/verification-curl.cpp |
| To merge this branch: | bzr merge lp://staging/~dobey/pay-service/log-more |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Indicator Applet Developers | Pending | ||
|
Review via email:
|
|||
Unmerged revisions
- 26. By dobey
-
Merge ted's logging changes.
- 25. By dobey
-
Merge ted's fixes.
- 24. By dobey
-
[ Ted Gould ]
Verify purchase status after running Purchase UI - 23. By dobey
-
A little more logging.
- 22. By dobey
-
[ Ted Gould ]
* Correct error message copy
* Bootstrap documentation for libpay
[ Rodney Dawes ]
* Drop the extra include of FindPkgConfig as it is not needed. (LP:
#1337332)
* Append a / to the URL path to avoid a redirect from the server. (LP:
#1340350)
* Append the correct thing to the headers list. (LP: #1337493) - 21. By dobey
-
Merge better avoid-redirect fix.
- 20. By dobey
-
Save the item id and include it in log messages.
- 19. By dobey
-
Merge fixed avoid-redirect.
- 18. By dobey
-
Log URL and redirected URL too.
- 17. By dobey
-
[ Ted Gould ]
* When setting up staging set the DBus activation environment as well
[ Rodney Dawes ]
* Remove a superfluous semicolon. Add a thread.detach to permit the
thread to execute/exit independently. (LP: #1335974)
* Recommend libglib2.0-bin and upstart as setup-staging.sh requires
them. Specify the full path to initctl and restart as /sbin is not
in $PATH.
