desktopcouch

Merge lp://qastaging/~thisfred/desktopcouch/kill-the-monkey into lp://qastaging/desktopcouch

  1. kill-the-monkey
  2. Merge into trunk
Proposed by Eric Casteleijn
Status: Merged
Approved by: Eric Casteleijn
Approved revision: 213
Merged at revision: 213
Proposed branch: lp://qastaging/~thisfred/desktopcouch/kill-the-monkey
Merge into: lp://qastaging/desktopcouch
Diff against target: 80 lines (+10/-29)
1 file modified
desktopcouch/records/server_base.py (+10/-29)
To merge this branch: bzr merge lp://qastaging/~thisfred/desktopcouch/kill-the-monkey
Reviewer Review Type Date Requested Status
Vincenzo Di Somma (community) Approve
Chad Miller (community) Approve
Review via email: mp+41000@code.qastaging.launchpad.net

Commit message

Remove an unnecessary monkey patch to python-couchdb.

Description of the change

Remove an unnecessary monkey patch.

BAD MONKEY! MONKEY SEE? MONKEY DO! MONKEY WILL DESTROY YOU!

To post a comment you must log in.
Revision history for this message
Chad Miller (cmiller) wrote :

59 + """This method is used to monkey patch the database to provide a
60 + get_changes method"""

review: Needs Fixing
Revision history for this message
Eric Casteleijn (thisfred) wrote :

Ah, oops yes :) fix pushed.

Revision history for this message
Chad Miller (cmiller) :
review: Approve
Revision history for this message
Vincenzo Di Somma (vds) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

Attempt to merge into lp:desktopcouch failed due to conflicts:

text conflict in desktopcouch/records/server_base.py

lp://qastaging/~thisfred/desktopcouch/kill-the-monkey updated
213. By Eric Casteleijn

remerged trunk and resolved conflict

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