Merge lp://staging/~brianaker/libmemcached/merge-1.0-april-2013 into lp://staging/libmemcached
Proposed by
Brian Aker
Status: | Merged |
---|---|
Merged at revision: | 1102 |
Proposed branch: | lp://staging/~brianaker/libmemcached/merge-1.0-april-2013 |
Merge into: | lp://staging/libmemcached |
Diff against target: |
1410 lines (+436/-154) 32 files modified
bootstrap.sh (+151/-23) clients/memflush.cc (+1/-1) clients/memping.cc (+1/-1) clients/memrm.cc (+1/-1) libmemcached/connect.cc (+5/-2) libtest/cmdline.cc (+27/-24) libtest/cmdline.h (+0/-3) libtest/common.h (+1/-1) libtest/dream.cc (+1/-1) libtest/drizzled.cc (+5/-5) libtest/framework.cc (+1/-1) libtest/framework.h (+1/-1) libtest/has.cc (+50/-4) libtest/has.hpp (+9/-1) libtest/include.am (+13/-2) libtest/lite.h (+2/-10) libtest/main.cc (+2/-3) libtest/memcached.cc (+5/-5) libtest/memcached.hpp (+1/-1) libtest/result.cc (+1/-0) libtest/run-ci.gdb (+1/-0) libtest/run.gdb (+1/-0) libtest/server_container.cc (+7/-5) libtest/signal.cc (+3/-7) libtest/unittest.cc (+9/-0) libtest/valgrind.h (+55/-0) libtest/vchar.cc (+5/-0) libtest/vchar.hpp (+3/-0) m4/ax_harden_compiler_flags.m4 (+66/-48) tests/keys.hpp (+3/-3) tests/libmemcached-1.0/mem_functions.cc (+1/-1) tests/libmemcached-1.0/sasl.cc (+4/-0) |
To merge this branch: | bzr merge lp://staging/~brianaker/libmemcached/merge-1.0-april-2013 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tangent Trunk | Pending | ||
Review via email: mp+159924@code.staging.launchpad.net |
To post a comment you must log in.