Merge lp://staging/~cmiller/desktopcouch/decode-dbus-data-from-creds into lp://staging/desktopcouch
Proposed by
Chad Miller
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Chad Miller | ||||
Approved revision: | 255 | ||||
Merged at revision: | 253 | ||||
Proposed branch: | lp://staging/~cmiller/desktopcouch/decode-dbus-data-from-creds | ||||
Merge into: | lp://staging/desktopcouch | ||||
Diff against target: |
35 lines (+17/-1) 1 file modified
desktopcouch/application/replication_services/ubuntuone.py (+17/-1) |
||||
To merge this branch: | bzr merge lp://staging/~cmiller/desktopcouch/decode-dbus-data-from-creds | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Albisetti (community) | Approve | ||
Eric Casteleijn (community) | Approve | ||
Review via email: mp+45568@code.staging.launchpad.net |
Commit message
In the ubuntuone service module, where we request credentials from dbus, we get back a DBus structure that can't be encoded by some JSON libraries that python-couchdb uses. Manually decode now. (LP: #700132)
To post a comment you must log in.
+1