Merge lp://qastaging/~brianaker/libmemcached/1220444 into lp://qastaging/libmemcached
Proposed by
Brian Aker
| Status: | Merged |
|---|---|
| Merged at revision: | 1109 |
| Proposed branch: | lp://qastaging/~brianaker/libmemcached/1220444 |
| Merge into: | lp://qastaging/libmemcached |
| Diff against target: |
835 lines (+210/-129) (has conflicts) 23 files modified
bootstrap.sh (+45/-17) clients/generator.cc (+5/-3) clients/memcp.cc (+1/-1) clients/memslap.cc (+5/-3) libmemcached/io.cc (+4/-4) libmemcached/string.cc (+11/-9) libtest/cmdline.cc (+1/-1) libtest/core.cc (+2/-2) libtest/cpu.cc (+5/-0) libtest/main.cc (+9/-2) libtest/unittest.cc (+5/-5) m4/ax_debug.m4 (+4/-2) m4/ax_harden_compiler_flags.m4 (+36/-0) m4/ax_memcached.m4 (+10/-21) m4/hiredis.m4 (+26/-34) tests/libmemcached-1.0/plus.cpp (+7/-0) tests/memcat.cc (+7/-5) tests/memcp.cc (+4/-0) tests/memdump.cc (+3/-2) tests/memexist.cc (+8/-8) tests/memping.cc (+2/-2) tests/memrm.cc (+3/-1) tests/memtouch.cc (+7/-7) Text conflict in bootstrap.sh Text conflict in libtest/cpu.cc Text conflict in libtest/main.cc Text conflict in m4/ax_harden_compiler_flags.m4 |
| To merge this branch: | bzr merge lp://qastaging/~brianaker/libmemcached/1220444 |
| 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
