Merge lp://qastaging/~brianaker/libmemcached/merge-of-1.0 into lp://qastaging/libmemcached

Proposed by Brian Aker
Status: Merged
Merged at revision: 1109
Proposed branch: lp://qastaging/~brianaker/libmemcached/merge-of-1.0
Merge into: lp://qastaging/libmemcached
Diff against target: 1745 lines (+475/-347)
39 files modified
bootstrap.sh (+15/-17)
clients/generator.cc (+5/-3)
clients/memcp.cc (+1/-1)
clients/memslap.cc (+5/-3)
clients/memtouch.cc (+1/-1)
clients/ms_setting.h (+1/-1)
docs/memcached_auto.rst (+4/-2)
libmemcached-1.2/deprecated_types.h (+1/-0)
libmemcached/auto.cc (+5/-0)
libmemcached/connect.cc (+1/-1)
libmemcached/error.cc (+138/-119)
libmemcached/get.cc (+15/-5)
libmemcached/io.cc (+9/-4)
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/string.cc (+11/-9)
libmemcached/touch.cc (+2/-2)
libtest/cmdline.cc (+1/-1)
libtest/core.cc (+2/-2)
libtest/main.cc (+6/-3)
libtest/unittest.cc (+5/-5)
m4/ax_debug.m4 (+4/-2)
tests/cli.am (+9/-0)
tests/libmemcached-1.0/all_tests.h (+4/-2)
tests/libmemcached-1.0/mem_functions.cc (+113/-73)
tests/libmemcached-1.0/mem_functions.h (+2/-0)
tests/libmemcached-1.0/plus.cpp (+7/-0)
tests/libmemcached_world.h (+2/-0)
tests/libmemcached_world_socket.h (+3/-0)
tests/memcat.cc (+7/-5)
tests/memcp.cc (+4/-0)
tests/memdump.cc (+6/-13)
tests/memexist.cc (+8/-8)
tests/memping.cc (+2/-2)
tests/memrm.cc (+3/-1)
tests/memtouch.cc (+7/-7)
To merge this branch: bzr merge lp://qastaging/~brianaker/libmemcached/merge-of-1.0
Reviewer Review Type Date Requested Status
Tangent Trunk Pending
Review via email: mp+190637@code.qastaging.launchpad.net
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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: