desktopcouch

Merge lp:~thisfred/desktopcouch/lp-599847 into lp:desktopcouch

  1. lp-599847
  2. Merge into trunk
Proposed by Eric Casteleijn
Status: Merged
Approved by: Eric Casteleijn
Approved revision: 269
Merged at revision: 270
Proposed branch: lp:~thisfred/desktopcouch/lp-599847
Merge into: lp:desktopcouch
Diff against target: 12 lines (+1/-1)
1 file modified
desktopcouch/application/replication_services/example.py (+1/-1)
To merge this branch: bzr merge lp:~thisfred/desktopcouch/lp-599847
Reviewer Review Type Date Requested Status
Chad Miller (community) Approve
Roberto Alsina (community) Approve
Review via email: mp+56644@code.launchpad.net

Commit message

brought replication_services/example.py up to date with current api

Description of the change

brought replication_services/example.py up to date with current api

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve
Revision history for this message
Chad Miller (cmiller) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'desktopcouch/application/replication_services/example.py'
2--- desktopcouch/application/replication_services/example.py 2010-12-09 18:25:57 +0000
3+++ desktopcouch/application/replication_services/example.py 2011-04-06 20:20:50 +0000
4@@ -21,7 +21,7 @@
5
6
7 # Required
8-def oauth_data():
9+def get_oauth_data():
10 """OAuth information needed to replicate to a server. This may be
11 called from a subthread, so be sure not to violate any execution
12 idioms, like updating the GUI from a non-main thread."""

Subscribers

People subscribed via source and target branches