Merge lp://qastaging/~brianaker/libmemcached/key-cleanup into lp://qastaging/libmemcached/1.0
Proposed by
Brian Aker
| Status: | Merged |
|---|---|
| Merged at revision: | 1170 |
| Proposed branch: | lp://qastaging/~brianaker/libmemcached/key-cleanup |
| Merge into: | lp://qastaging/libmemcached/1.0 |
| Diff against target: |
880 lines (+269/-217) 17 files modified
libmemcached/auto.cc (+0/-1) libmemcached/connect.cc (+1/-1) libmemcached/error.cc (+138/-119) libmemcached/get.cc (+15/-5) libmemcached/io.cc (+5/-0) libmemcached/io.hpp (+2/-1) libmemcached/key.cc (+47/-23) libmemcached/key.hpp (+0/-24) libmemcached/response.cc (+10/-1) libmemcached/stats.cc (+7/-6) libmemcached/touch.cc (+2/-2) m4/ax_pthread.m4 (+16/-12) tests/cli.am (+9/-0) tests/libmemcached-1.0/mem_functions.cc (+9/-11) tests/libmemcached_world.h (+2/-0) tests/libmemcached_world_socket.h (+3/-0) tests/memdump.cc (+3/-11) |
| To merge this branch: | bzr merge lp://qastaging/~brianaker/libmemcached/key-cleanup |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tangent Trunk | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
