Viewing all changes in revision 967.
- Committer: Brian Aker
- Date: 2011-10-07 13:13:28 UTC
- mfrom: (962.1.12 libmemcached-launchpad-build)
- Revision ID: brian@tangent.org-20111007131328-p9hhh3co7gae9mo4
Merge trunk
- files added:
- clients/memtouch.cc
- libhashkit-1.0
- libmemcached-1.0
- libmemcached-1.0/memcached
- libmemcached-1.0/protocol
- libmemcachedprotocol
- libmemcachedprotocol-0.0
- libmemcachedutil
- libmemcachedutil-1.0
- files removed:
- libmemcached/memcached_util.h
- libmemcached/protocol
- libmemcached/util
- files renamed:
- libhashkit/algorithm.h => libhashkit-1.0/algorithm.h
- libhashkit/behavior.h => libhashkit-1.0/behavior.h
- libhashkit/configure.h.in => libhashkit-1.0/configure.h.in
- libhashkit/digest.h => libhashkit-1.0/digest.h
- libhashkit/function.h => libhashkit-1.0/function.h
- libhashkit/has.h => libhashkit-1.0/has.h
- libhashkit/hashkit.h => libhashkit-1.0/hashkit.h
- libhashkit/hashkit.hpp => libhashkit-1.0/hashkit.hpp
- libhashkit/str_algorithm.h => libhashkit-1.0/str_algorithm.h
- libhashkit/strerror.h => libhashkit-1.0/strerror.h
- libhashkit/types.h => libhashkit-1.0/types.h
- libhashkit/visibility.h => libhashkit-1.0/visibility.h
- libmemcached/allocators.h => libmemcached-1.0/allocators.h
- libmemcached/analyze.h => libmemcached-1.0/analyze.h
- libmemcached/auto.h => libmemcached-1.0/auto.h
- libmemcached/basic_string.h => libmemcached-1.0/basic_string.h
- libmemcached/behavior.h => libmemcached-1.0/behavior.h
- libmemcached/callback.h => libmemcached-1.0/callback.h
- libmemcached/configure.h.in => libmemcached-1.0/configure.h.in
- libmemcached/constants.h => libmemcached-1.0/constants.h
- libmemcached/delete.h => libmemcached-1.0/delete.h
- libmemcached/dump.h => libmemcached-1.0/dump.h
- libmemcached/error.h => libmemcached-1.0/error.h
- libmemcached/exception.hpp => libmemcached-1.0/exception.hpp
- libmemcached/exist.h => libmemcached-1.0/exist.h
- libmemcached/fetch.h => libmemcached-1.0/fetch.h
- libmemcached/flush.h => libmemcached-1.0/flush.h
- libmemcached/flush_buffers.h => libmemcached-1.0/flush_buffers.h
- libmemcached/get.h => libmemcached-1.0/get.h
- libmemcached/hash.h => libmemcached-1.0/hash.h
- libmemcached/memcached.h => libmemcached-1.0/memcached.h
- libmemcached/memcached.hpp => libmemcached-1.0/memcached.hpp
- libmemcached/options.h => libmemcached-1.0/options.h
- libmemcached/parse.h => libmemcached-1.0/parse.h
- libmemcached/platform.h => libmemcached-1.0/platform.h
- libmemcached/quit.h => libmemcached-1.0/quit.h
- libmemcached/result.h => libmemcached-1.0/result.h
- libmemcached/return.h => libmemcached-1.0/return.h
- libmemcached/sasl.h => libmemcached-1.0/sasl.h
- libmemcached/server.h => libmemcached-1.0/server.h
- libmemcached/server_list.h => libmemcached-1.0/server_list.h
- libmemcached/stats.h => libmemcached-1.0/stats.h
- libmemcached/storage.h => libmemcached-1.0/storage.h
- libmemcached/strerror.h => libmemcached-1.0/strerror.h
- libmemcached/string.h => libmemcached-1.0/string.h
- libmemcached/types.h => libmemcached-1.0/types.h
- libmemcached/verbosity.h => libmemcached-1.0/verbosity.h
- libmemcached/version.h => libmemcached-1.0/version.h
- libmemcached/visibility.h => libmemcached-1.0/visibility.h
- libmemcached/protocol/callback.h => libmemcachedprotocol-0.0/callback.h
- libmemcached/protocol_handler.h => libmemcachedprotocol-0.0/handler.h
- libmemcached/protocol/ascii_handler.c => libmemcachedprotocol/ascii_handler.c
- libmemcached/protocol/ascii_handler.h => libmemcachedprotocol/ascii_handler.h
- libmemcached/protocol/binary_handler.c => libmemcachedprotocol/binary_handler.c
- libmemcached/protocol/binary_handler.h => libmemcachedprotocol/binary_handler.h
- libmemcached/protocol/cache.c => libmemcachedprotocol/cache.c
- libmemcached/protocol/cache.h => libmemcachedprotocol/cache.h
- libmemcached/protocol/common.h => libmemcachedprotocol/common.h
- libmemcached/protocol/protocol_handler.c => libmemcachedprotocol/handler.c
- libmemcached/protocol/include.am => libmemcachedprotocol/include.am
- libmemcached/protocol/pedantic.c => libmemcachedprotocol/pedantic.c
- libmemcached/util/flush.h => libmemcachedutil-1.0/flush.h
- libmemcached/util/pid.h => libmemcachedutil-1.0/pid.h
- libmemcached/util/ping.h => libmemcachedutil-1.0/ping.h
- libmemcached/util/pool.h => libmemcachedutil-1.0/pool.h
- libmemcached/util.h => libmemcachedutil-1.0/util.h
- libmemcached/util/version.h => libmemcachedutil-1.0/version.h
- libmemcached/util/flush.cc => libmemcachedutil/flush.cc
- libmemcached/util/include.am => libmemcachedutil/include.am
- libmemcached/util/pid.cc => libmemcachedutil/pid.cc
- libmemcached/util/ping.cc => libmemcachedutil/ping.cc
- libmemcached/util/pool.cc => libmemcachedutil/pool.cc
- libmemcached/util/version.cc => libmemcachedutil/version.cc
- files modified:
- .bzrignore
expand all
collapse all
added
removed
