Merge lp:~thisfred/u1db/combine-mapping-3 into lp:u1db
Proposed by
Eric Casteleijn
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Eric Casteleijn | ||||
Approved revision: | 369 | ||||
Merged at revision: | 363 | ||||
Proposed branch: | lp:~thisfred/u1db/combine-mapping-3 | ||||
Merge into: | lp:u1db | ||||
Prerequisite: | lp:~thisfred/u1db/combine-mapping-2 | ||||
Diff against target: |
186 lines (+85/-3) 5 files modified
src/u1db_query.c (+20/-3) u1db/query_parser.py (+21/-0) u1db/tests/c_backend_wrapper.pyx (+6/-0) u1db/tests/test_backends.py (+32/-0) u1db/tests/test_query_parser.py (+6/-0) |
||||
To merge this branch: | bzr merge lp:~thisfred/u1db/combine-mapping-3 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Samuele Pedroni | Approve | ||
Review via email: mp+116526@code.launchpad.net |
This proposal supersedes a proposal from 2012-07-24.
Commit message
Added the combine() mapping.
Description of the change
Added the combine() mapping.
To post a comment you must log in.