Merge lp://staging/~thisfred/desktopcouch/optional-reduce into lp://staging/desktopcouch
Proposed by
Eric Casteleijn
| Status: | Merged |
|---|---|
| Approved by: | Eric Casteleijn |
| Approved revision: | 212 |
| Merged at revision: | 209 |
| Proposed branch: | lp://staging/~thisfred/desktopcouch/optional-reduce |
| Merge into: | lp://staging/desktopcouch |
| Diff against target: |
491 lines (+94/-65) 10 files modified
desktopcouch/contacts/view.py (+18/-11) desktopcouch/pair/couchdb_pairing/couchdb_io.py (+1/-1) desktopcouch/pair/couchdb_pairing/ubuntuone_pairing.py (+5/-2) desktopcouch/pair/tests/test_ubuntuone_pairing.py (+9/-7) desktopcouch/records/doc/records.txt (+1/-2) desktopcouch/records/server_base.py (+3/-5) desktopcouch/records/tests/test_server.py (+5/-4) desktopcouch/start_local_couchdb.py (+33/-21) desktopcouch/tests/test_start_local_couchdb.py (+18/-11) utilities/lint.sh (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~thisfred/desktopcouch/optional-reduce |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Vincenzo Di Somma (community) | Approve | ||
| Chad Miller (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Make the rarely used reduce_js an optional argument to 'add_view'
Description of the change
Make the rarely used reduce_js an optional argument to add_view. Also make sure that we explicitly use keyword arguments where they exist when calling this method, rather than relying on position.
To post a comment you must log in.
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 | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Attempt to merge into lp:desktopcouch failed due to conflicts:
text conflict in utilities/lint.sh