Merge lp://staging/~thisfred/u1db/fix-error-msg into lp://staging/u1db
Proposed by
Eric Casteleijn
| Status: | Merged |
|---|---|
| Approved by: | Eric Casteleijn |
| Approved revision: | 421 |
| Merged at revision: | 420 |
| Proposed branch: | lp://staging/~thisfred/u1db/fix-error-msg |
| Merge into: | lp://staging/u1db |
| Diff against target: |
26 lines (+5/-0) 2 files modified
u1db/backends/__init__.py (+2/-0) u1db/tests/test_backends.py (+3/-0) |
| To merge this branch: | bzr merge lp://staging/~thisfred/u1db/fix-error-msg |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Lucio Torre (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fixed the error message in the case a user provides JSON to create_doc, which expects a Python dictionary.
Description of the change
Fixed the error message in the case a user provides JSON to create_doc, which expects a Python dictionary.
To post a comment you must log in.
Revision history for this message
| Lucio Torre (lucio.torre) | # |
review:
Approve
Revision history for this message
| Ubuntu One Auto Pilot (otto-pilot) wrote | # |
Revision history for this message
| Ubuntu One Auto Pilot (otto-pilot) wrote | # |
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
The attempt to merge lp:~thisfred/u1db/fix-error-msg into lp:u1db failed. Below is the output from the failed tests.
/bin/sh: 1: cmake: not found