Merge lp://qastaging/~brianaker/libmemcached/update-1.2 into lp://qastaging/libmemcached
Proposed by
Brian Aker
Status: | Merged |
---|---|
Merged at revision: | 1105 |
Proposed branch: | lp://qastaging/~brianaker/libmemcached/update-1.2 |
Merge into: | lp://qastaging/libmemcached |
Diff against target: |
4777 lines (+1598/-736) 71 files modified
bootstrap.sh (+357/-304) clients/include.am (+2/-1) clients/memcat.cc (+4/-1) clients/memcp.cc (+1/-1) clients/memdump.cc (+1/-1) clients/memexist.cc (+1/-1) clients/memflush.cc (+1/-1) clients/memping.cc (+3/-0) clients/memrm.cc (+1/-1) clients/memstat.cc (+1/-1) clients/memtouch.cc (+1/-1) clients/utilities.cc (+7/-3) configure.ac (+1/-0) docs/include.am (+13/-13) libhashkit/digest.cc (+3/-0) libmemcached-1.2/feature.h (+53/-0) libmemcached-1.2/include.am (+1/-0) libmemcached-1.2/memcached.h (+2/-0) libmemcached-1.2/sasl.h (+2/-2) libmemcached/connect.cc (+4/-4) libmemcached/csl/parser.yy (+5/-0) libmemcached/csl/scanner.l (+4/-0) libmemcached/feature.cc (+51/-0) libmemcached/feature.h (+37/-0) libmemcached/flag.cc (+3/-1) libmemcached/hosts.cc (+6/-0) libmemcached/include.am (+2/-0) libmemcached/memcached.cc (+2/-2) libmemcached/response.cc (+0/-1) libmemcached/sasl.cc (+189/-177) libmemcachedutil/pid.cc (+1/-1) libmemcachedutil/ping.cc (+1/-1) libtest/abort.cc (+3/-0) libtest/alarm.cc (+31/-23) libtest/client.cc (+192/-26) libtest/client.hpp (+31/-0) libtest/cmdline.cc (+75/-14) libtest/cmdline.h (+1/-0) libtest/collection.cc (+6/-0) libtest/cpu.cc (+12/-11) libtest/cpu.hpp (+3/-1) libtest/drizzled.cc (+5/-0) libtest/error.h (+74/-0) libtest/framework.cc (+122/-47) libtest/gearmand.cc (+12/-1) libtest/has.cc (+6/-5) libtest/http.cc (+12/-0) libtest/include.am (+3/-0) libtest/is_local.cc (+11/-0) libtest/is_local.hpp (+6/-0) libtest/lite.h (+23/-11) libtest/main.cc (+47/-4) libtest/memcached.cc (+5/-3) libtest/result.hpp (+1/-1) libtest/server.cc (+18/-7) libtest/server.h (+20/-1) libtest/signal.cc (+2/-1) libtest/string.hpp (+1/-0) libtest/unittest.cc (+61/-13) m4/ax_harden_compiler_flags.m4 (+1/-1) m4/ax_prog_sphinx_build.m4 (+23/-20) rpm/include.am (+1/-1) support/libmemcached.spec.in (+1/-0) tests/keys.hpp (+3/-0) tests/libmemcached-1.0/all_tests.cc (+1/-1) tests/libmemcached-1.0/generate.cc (+3/-0) tests/libmemcached-1.0/pool.cc (+4/-1) tests/libmemcached-1.0/sasl.cc (+15/-22) tests/libmemcached_world.h (+1/-1) tests/memcp.cc (+1/-1) version.m4 (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~brianaker/libmemcached/update-1.2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tangent Trunk | Pending | ||
Review via email: mp+168655@code.qastaging.launchpad.net |
To post a comment you must log in.