Merge lp://qastaging/~avsej/libmemcached/touch-command into lp://qastaging/~tangent-org/libmemcached/trunk
Proposed by
Sergey Avseyev
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~avsej/libmemcached/touch-command |
Merge into: | lp://qastaging/~tangent-org/libmemcached/trunk |
Diff against target: |
99078 lines (+95976/-0) (has conflicts) 611 files modified
.bzrignore (+100/-0) .hgignore (+87/-0) .quickly (+5/-0) AUTHORS (+11/-0) COPYING (+33/-0) ChangeLog (+393/-0) Makefile.am (+111/-0) NEWS (+1/-0) README (+43/-0) README.FIRST (+31/-0) README.win32 (+25/-0) THANKS (+14/-0) TODO (+11/-0) clients/client_options.h (+45/-0) clients/execute.cc (+131/-0) clients/execute.h (+30/-0) clients/generator.cc (+96/-0) clients/generator.h (+36/-0) clients/include.am (+116/-0) clients/memaslap.c (+908/-0) clients/memcapable.cc (+2094/-0) clients/memcat.cc (+242/-0) clients/memcp.cc (+317/-0) clients/memdump.cc (+183/-0) clients/memerror.cc (+102/-0) clients/memflush.cc (+154/-0) clients/memparse.cc (+68/-0) clients/memrm.cc (+177/-0) clients/memslap.cc (+495/-0) clients/memstat.cc (+349/-0) clients/ms_atomic.h (+69/-0) clients/ms_conn.c (+3413/-0) clients/ms_conn.h (+241/-0) clients/ms_memslap.h (+132/-0) clients/ms_setting.c (+1068/-0) clients/ms_setting.h (+181/-0) clients/ms_sigsegv.c (+126/-0) clients/ms_sigsegv.h (+34/-0) clients/ms_stats.c (+307/-0) clients/ms_stats.h (+69/-0) clients/ms_task.c (+1114/-0) clients/ms_task.h (+94/-0) clients/ms_thread.c (+351/-0) clients/ms_thread.h (+78/-0) clients/utilities.cc (+229/-0) clients/utilities.h (+64/-0) config/autorun.sh (+126/-0) config/config.rpath (+666/-0) config/lcov.am (+42/-0) config/pandora-plugin (+752/-0) config/uncrustify.cfg (+1112/-0) configure.ac (+186/-0) docs/client_errors/MEMCACHED_AUTH_CONTINUE.rst (+5/-0) docs/client_errors/MEMCACHED_AUTH_FAILURE.rst (+5/-0) docs/client_errors/MEMCACHED_AUTH_PROBLEM.rst (+5/-0) docs/client_errors/MEMCACHED_BAD_KEY_PROVIDED.rst (+5/-0) docs/client_errors/MEMCACHED_BUFFERED.rst (+5/-0) docs/client_errors/MEMCACHED_CLIENT_ERROR.rst (+5/-0) docs/client_errors/MEMCACHED_CONNECTION_BIND_FAILURE.rst (+5/-0) docs/client_errors/MEMCACHED_CONNECTION_FAILURE.rst (+5/-0) docs/client_errors/MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE.rst (+5/-0) docs/client_errors/MEMCACHED_DATA_DOES_NOT_EXIST.rst (+5/-0) docs/client_errors/MEMCACHED_DATA_EXISTS.rst (+5/-0) docs/client_errors/MEMCACHED_DELETED.rst (+5/-0) docs/client_errors/MEMCACHED_DEPRECATED.rst (+5/-0) docs/client_errors/MEMCACHED_E2BIG.rst (+5/-0) docs/client_errors/MEMCACHED_END.rst (+5/-0) docs/client_errors/MEMCACHED_ERRNO.rst (+5/-0) docs/client_errors/MEMCACHED_FAILURE.rst (+5/-0) docs/client_errors/MEMCACHED_FAIL_UNIX_SOCKET.rst (+5/-0) docs/client_errors/MEMCACHED_FETCH_NOTFINISHED.rst (+5/-0) docs/client_errors/MEMCACHED_HOST_LOOKUP_FAILURE.rst (+5/-0) docs/client_errors/MEMCACHED_INVALID_ARGUMENTS.rst (+5/-0) docs/client_errors/MEMCACHED_INVALID_HOST_PROTOCOL.rst (+5/-0) docs/client_errors/MEMCACHED_ITEM.rst (+5/-0) docs/client_errors/MEMCACHED_KEY_TOO_BIG.rst (+5/-0) docs/client_errors/MEMCACHED_MAXIMUM_RETURN.rst (+5/-0) docs/client_errors/MEMCACHED_MEMORY_ALLOCATION_FAILURE.rst (+5/-0) docs/client_errors/MEMCACHED_NOTFOUND.rst (+5/-0) docs/client_errors/MEMCACHED_NOTSTORED.rst (+5/-0) docs/client_errors/MEMCACHED_NOT_SUPPORTED.rst (+5/-0) docs/client_errors/MEMCACHED_NO_KEY_PROVIDED.rst (+5/-0) docs/client_errors/MEMCACHED_NO_SERVERS.rst (+5/-0) docs/client_errors/MEMCACHED_PARSE_ERROR.rst (+5/-0) docs/client_errors/MEMCACHED_PARSE_USER_ERROR.rst (+5/-0) docs/client_errors/MEMCACHED_PARTIAL_READ.rst (+5/-0) docs/client_errors/MEMCACHED_PROTOCOL_ERROR.rst (+5/-0) docs/client_errors/MEMCACHED_READ_FAILURE.rst (+5/-0) docs/client_errors/MEMCACHED_SERVER_ERROR.rst (+5/-0) docs/client_errors/MEMCACHED_SERVER_MARKED_DEAD.rst (+5/-0) docs/client_errors/MEMCACHED_SOME_ERRORS.rst (+5/-0) docs/client_errors/MEMCACHED_STAT.rst (+5/-0) docs/client_errors/MEMCACHED_STORED.rst (+5/-0) docs/client_errors/MEMCACHED_SUCCESS.rst (+5/-0) docs/client_errors/MEMCACHED_TIMEOUT.rst (+5/-0) docs/client_errors/MEMCACHED_UNKNOWN_READ_FAILURE.rst (+5/-0) docs/client_errors/MEMCACHED_UNKNOWN_STAT_KEY.rst (+5/-0) docs/client_errors/MEMCACHED_VALUE.rst (+5/-0) docs/client_errors/MEMCACHED_WRITE_FAILURE.rst (+5/-0) docs/conf.py.in (+355/-0) docs/error_messages.rst (+55/-0) docs/hashkit_create.rst (+65/-0) docs/hashkit_functions.rst (+76/-0) docs/hashkit_value.rst (+58/-0) docs/include.am (+240/-0) docs/index.rst (+131/-0) docs/libhashkit.rst (+35/-0) docs/libmemcached.rst (+185/-0) docs/libmemcached/memcached_return_t.rst (+133/-0) docs/libmemcached_configuration.rst (+225/-0) docs/libmemcached_examples.rst (+144/-0) docs/libmemcachedutil.rst (+57/-0) docs/man/hashkit_clone.3 (+92/-0) docs/man/hashkit_crc32.3 (+105/-0) docs/man/hashkit_create.3 (+92/-0) docs/man/hashkit_fnv1_32.3 (+105/-0) docs/man/hashkit_fnv1_64.3 (+105/-0) docs/man/hashkit_fnv1a_32.3 (+105/-0) docs/man/hashkit_fnv1a_64.3 (+105/-0) docs/man/hashkit_free.3 (+92/-0) docs/man/hashkit_functions.3 (+105/-0) docs/man/hashkit_hsieh.3 (+105/-0) docs/man/hashkit_is_allocated.3 (+92/-0) docs/man/hashkit_jenkins.3 (+105/-0) docs/man/hashkit_md5.3 (+105/-0) docs/man/hashkit_murmur.3 (+105/-0) docs/man/hashkit_value.3 (+66/-0) docs/man/libhashkit.3 (+57/-0) docs/man/libmemcached.3 (+215/-0) docs/man/libmemcached_check_configuration.3 (+293/-0) docs/man/libmemcached_configuration.3 (+293/-0) docs/man/libmemcached_examples.3 (+144/-0) docs/man/libmemcachedutil.3 (+68/-0) docs/man/memaslap.1 (+1220/-0) docs/man/memcached.3 (+293/-0) docs/man/memcached_add.3 (+121/-0) docs/man/memcached_add_by_key.3 (+121/-0) docs/man/memcached_analyze.3 (+77/-0) docs/man/memcached_append.3 (+111/-0) docs/man/memcached_append_by_key.3 (+111/-0) docs/man/memcached_auto.3 (+124/-0) docs/man/memcached_behavior.3 (+329/-0) docs/man/memcached_behavior_get.3 (+329/-0) docs/man/memcached_behavior_set.3 (+329/-0) docs/man/memcached_callback.3 (+174/-0) docs/man/memcached_callback_get.3 (+174/-0) docs/man/memcached_callback_set.3 (+174/-0) docs/man/memcached_cas.3 (+91/-0) docs/man/memcached_cas_by_key.3 (+91/-0) docs/man/memcached_clone.3 (+104/-0) docs/man/memcached_create.3 (+104/-0) docs/man/memcached_decrement.3 (+124/-0) docs/man/memcached_decrement_with_initial.3 (+124/-0) docs/man/memcached_delete.3 (+84/-0) docs/man/memcached_delete_by_key.3 (+84/-0) docs/man/memcached_destroy_sasl_auth_data.3 (+94/-0) docs/man/memcached_dump.3 (+78/-0) docs/man/memcached_fetch.3 (+168/-0) docs/man/memcached_fetch_execute.3 (+168/-0) docs/man/memcached_fetch_result.3 (+168/-0) docs/man/memcached_flush.3 (+73/-0) docs/man/memcached_flush_buffers.3 (+72/-0) docs/man/memcached_free.3 (+104/-0) docs/man/memcached_generate_hash.3 (+85/-0) docs/man/memcached_generate_hash_value.3 (+85/-0) docs/man/memcached_get.3 (+168/-0) docs/man/memcached_get_by_key.3 (+168/-0) docs/man/memcached_get_memory_allocators.3 (+112/-0) docs/man/memcached_get_sasl_callbacks.3 (+94/-0) docs/man/memcached_get_user_data.3 (+76/-0) docs/man/memcached_increment.3 (+124/-0) docs/man/memcached_increment_with_initial.3 (+124/-0) docs/man/memcached_lib_version.3 (+76/-0) docs/man/memcached_memory_allocators.3 (+112/-0) docs/man/memcached_mget.3 (+168/-0) docs/man/memcached_mget_by_key.3 (+168/-0) docs/man/memcached_mget_execute.3 (+168/-0) docs/man/memcached_mget_execute_by_key.3 (+168/-0) docs/man/memcached_pool.3 (+134/-0) docs/man/memcached_pool_behavior_get.3 (+134/-0) docs/man/memcached_pool_behavior_set.3 (+134/-0) docs/man/memcached_pool_create.3 (+134/-0) docs/man/memcached_pool_destroy.3 (+134/-0) docs/man/memcached_pool_pop.3 (+134/-0) docs/man/memcached_pool_push.3 (+134/-0) docs/man/memcached_pool_st.3 (+134/-0) docs/man/memcached_prepend.3 (+111/-0) docs/man/memcached_prepend_by_key.3 (+111/-0) docs/man/memcached_quit.3 (+73/-0) docs/man/memcached_replace.3 (+121/-0) docs/man/memcached_replace_by_key.3 (+121/-0) docs/man/memcached_result_cas.3 (+154/-0) docs/man/memcached_result_create.3 (+154/-0) docs/man/memcached_result_flags.3 (+154/-0) docs/man/memcached_result_free.3 (+154/-0) docs/man/memcached_result_key_length.3 (+154/-0) docs/man/memcached_result_key_value.3 (+154/-0) docs/man/memcached_result_length.3 (+154/-0) docs/man/memcached_result_st.3 (+154/-0) docs/man/memcached_result_value.3 (+154/-0) docs/man/memcached_return_t.3 (+261/-0) docs/man/memcached_sasl.3 (+94/-0) docs/man/memcached_sasl_set_auth_data.3 (+94/-0) docs/man/memcached_server_add.3 (+135/-0) docs/man/memcached_server_add_unix_socket.3 (+135/-0) docs/man/memcached_server_count.3 (+135/-0) docs/man/memcached_server_cursor.3 (+135/-0) docs/man/memcached_server_list.3 (+135/-0) docs/man/memcached_server_list_append.3 (+106/-0) docs/man/memcached_server_list_count.3 (+106/-0) docs/man/memcached_server_list_free.3 (+106/-0) docs/man/memcached_server_push.3 (+135/-0) docs/man/memcached_server_st.3 (+135/-0) docs/man/memcached_servers.3 (+135/-0) docs/man/memcached_servers_parse.3 (+106/-0) docs/man/memcached_servers_reset.3 (+104/-0) docs/man/memcached_set.3 (+121/-0) docs/man/memcached_set_by_key.3 (+121/-0) docs/man/memcached_set_memory_allocators.3 (+112/-0) docs/man/memcached_set_memory_allocators_context.3 (+112/-0) docs/man/memcached_set_sasl_callbacks.3 (+94/-0) docs/man/memcached_set_user_data.3 (+76/-0) docs/man/memcached_stat.3 (+103/-0) docs/man/memcached_stat_execute.3 (+103/-0) docs/man/memcached_stat_get_keys.3 (+103/-0) docs/man/memcached_stat_get_value.3 (+103/-0) docs/man/memcached_stat_servername.3 (+103/-0) docs/man/memcached_stats.3 (+103/-0) docs/man/memcached_strerror.3 (+67/-0) docs/man/memcached_user_data.3 (+76/-0) docs/man/memcached_verbosity.3 (+68/-0) docs/man/memcached_version.3 (+76/-0) docs/man/memcapable.1 (+93/-0) docs/man/memcat.1 (+81/-0) docs/man/memcp.1 (+88/-0) docs/man/memdump.1 (+70/-0) docs/man/memerror.1 (+69/-0) docs/man/memflush.1 (+83/-0) docs/man/memrm.1 (+82/-0) docs/man/memslap.1 (+79/-0) docs/man/memstat.1 (+80/-0) docs/memaslap.rst (+1248/-0) docs/memcached_analyze.rst (+67/-0) docs/memcached_append.rst (+97/-0) docs/memcached_auto.rst (+97/-0) docs/memcached_behavior.rst (+294/-0) docs/memcached_callback.rst (+162/-0) docs/memcached_cas.rst (+78/-0) docs/memcached_create.rst (+84/-0) docs/memcached_delete.rst (+73/-0) docs/memcached_dump.rst (+72/-0) docs/memcached_flush.rst (+65/-0) docs/memcached_flush_buffers.rst (+65/-0) docs/memcached_generate_hash_value.rst (+77/-0) docs/memcached_get.rst (+140/-0) docs/memcached_memory_allocators.rst (+93/-0) docs/memcached_pool.rst (+111/-0) docs/memcached_quit.rst (+63/-0) docs/memcached_result_st.rst (+117/-0) docs/memcached_sasl.rst (+82/-0) docs/memcached_server_st.rst (+83/-0) docs/memcached_servers.rst (+102/-0) docs/memcached_set.rst (+101/-0) docs/memcached_stats.rst (+89/-0) docs/memcached_strerror.rst (+57/-0) docs/memcached_user_data.rst (+73/-0) docs/memcached_verbosity.rst (+56/-0) docs/memcached_version.rst (+63/-0) docs/memcapable.rst (+83/-0) docs/memcat.rst (+73/-0) docs/memcp.rst (+75/-0) docs/memdump.rst (+58/-0) docs/memerror.rst (+58/-0) docs/memflush.rst (+67/-0) docs/memrm.rst (+71/-0) docs/memslap.rst (+64/-0) docs/memstat.rst (+61/-0) docs/tap.rst (+7/-0) example/include.am (+24/-0) example/interface_v0.c (+594/-0) example/interface_v1.c (+411/-0) example/memcached_light.c (+474/-0) example/memcached_light.h (+7/-0) example/storage.c (+172/-0) example/storage.h (+27/-0) example/storage_innodb.c (+535/-0) libhashkit/algorithm.cc (+69/-0) libhashkit/algorithm.h (+96/-0) libhashkit/behavior.cc (+9/-0) libhashkit/behavior.h (+26/-0) libhashkit/common.h (+33/-0) libhashkit/configure.h.in (+19/-0) libhashkit/crc32.cc (+86/-0) libhashkit/digest.cc (+60/-0) libhashkit/digest.h (+30/-0) libhashkit/fnv.cc (+75/-0) libhashkit/function.cc (+156/-0) libhashkit/function.h (+44/-0) libhashkit/hashkit.cc (+100/-0) libhashkit/hashkit.h (+95/-0) libhashkit/hashkit.hpp (+97/-0) libhashkit/hsieh.cc (+70/-0) libhashkit/include.am (+69/-0) libhashkit/jenkins.cc (+214/-0) libhashkit/ketama.cc (+164/-0) libhashkit/md5.cc (+367/-0) libhashkit/murmur.cc (+77/-0) libhashkit/one_at_a_time.cc (+34/-0) libhashkit/str_algorithm.cc (+57/-0) libhashkit/str_algorithm.h (+48/-0) libhashkit/strerror.cc (+25/-0) libhashkit/strerror.h (+23/-0) libhashkit/types.h (+89/-0) libhashkit/visibility.h (+48/-0) libmemcached/allocators.cc (+119/-0) libmemcached/allocators.h (+87/-0) libmemcached/analyze.cc (+110/-0) libmemcached/analyze.h (+66/-0) libmemcached/array.c (+128/-0) libmemcached/array.h (+75/-0) libmemcached/auto.cc (+383/-0) libmemcached/auto.h (+111/-0) libmemcached/basic_string.h (+55/-0) libmemcached/behavior.cc (+589/-0) libmemcached/behavior.h (+86/-0) libmemcached/byteorder.cc (+90/-0) libmemcached/byteorder.h (+52/-0) libmemcached/callback.cc (+160/-0) libmemcached/callback.h (+61/-0) libmemcached/common.h (+182/-0) libmemcached/configure.h.in (+52/-0) libmemcached/connect.cc (+634/-0) libmemcached/constants.h (+166/-0) libmemcached/delete.cc (+266/-0) libmemcached/delete.h (+57/-0) libmemcached/do.cc (+100/-0) libmemcached/do.hpp (+49/-0) libmemcached/dump.cc (+107/-0) libmemcached/dump.h (+51/-0) libmemcached/error.cc (+419/-0) libmemcached/error.h (+61/-0) libmemcached/error.hpp (+87/-0) libmemcached/exception.hpp (+63/-0) libmemcached/fetch.cc (+264/-0) libmemcached/fetch.h (+53/-0) libmemcached/flush.cc (+149/-0) libmemcached/flush.h (+49/-0) libmemcached/flush_buffers.cc (+66/-0) libmemcached/flush_buffers.h (+49/-0) libmemcached/get.cc (+698/-0) libmemcached/get.h (+110/-0) libmemcached/hash.cc (+178/-0) libmemcached/hash.h (+68/-0) libmemcached/hosts.cc (+513/-0) libmemcached/include.am (+182/-0) libmemcached/initialize_query.cc (+70/-0) libmemcached/initialize_query.h (+51/-0) libmemcached/internal.h (+46/-0) libmemcached/io.cc (+925/-0) libmemcached/io.h (+119/-0) libmemcached/is.h (+48/-0) libmemcached/key.cc (+23/-0) libmemcached/libmemcached_probes.d (+30/-0) libmemcached/libmemcached_probes.h (+118/-0) libmemcached/memcached.cc (+435/-0) libmemcached/memcached.h (+213/-0) libmemcached/memcached.hpp (+789/-0) libmemcached/memcached/README.txt (+7/-0) libmemcached/memcached/protocol_binary.h (+726/-0) libmemcached/memcached/vbucket.h (+26/-0) libmemcached/memcached_util.h (+44/-0) libmemcached/memory.h (+79/-0) libmemcached/options.cc (+184/-0) libmemcached/options.h (+71/-0) libmemcached/options/context.h (+151/-0) libmemcached/options/include.am (+19/-0) libmemcached/options/parser.cc (+2322/-0) libmemcached/options/parser.h (+122/-0) libmemcached/options/scanner.cc (+3203/-0) libmemcached/options/scanner.h (+479/-0) libmemcached/options/server.h (+60/-0) libmemcached/options/symbol.h (+57/-0) libmemcached/parse.cc (+110/-0) libmemcached/parse.h (+23/-0) libmemcached/platform.h (+56/-0) libmemcached/prefix_key.cc (+65/-0) libmemcached/prefix_key.h (+49/-0) libmemcached/protocol/ascii_handler.c (+963/-0) libmemcached/protocol/ascii_handler.h (+40/-0) libmemcached/protocol/binary_handler.c (+1121/-0) libmemcached/protocol/binary_handler.h (+47/-0) libmemcached/protocol/cache.c (+149/-0) libmemcached/protocol/cache.h (+116/-0) libmemcached/protocol/callback.h (+418/-0) libmemcached/protocol/common.h (+163/-0) libmemcached/protocol/include.am (+26/-0) libmemcached/protocol/pedantic.c (+202/-0) libmemcached/protocol/protocol_handler.c (+365/-0) libmemcached/protocol_handler.h (+215/-0) libmemcached/purge.cc (+90/-0) libmemcached/quit.cc (+139/-0) libmemcached/quit.h (+55/-0) libmemcached/response.cc (+634/-0) libmemcached/response.h (+57/-0) libmemcached/result.cc (+173/-0) libmemcached/result.h (+100/-0) libmemcached/return.h (+98/-0) libmemcached/sasl.c (+408/-0) libmemcached/sasl.h (+86/-0) libmemcached/server.cc (+351/-0) libmemcached/server.h (+169/-0) libmemcached/server_list.cc (+83/-0) libmemcached/server_list.h (+77/-0) libmemcached/stats.cc (+623/-0) libmemcached/stats.h (+96/-0) libmemcached/storage.cc (+567/-0) libmemcached/storage.h (+133/-0) libmemcached/strerror.cc (+189/-0) libmemcached/strerror.h (+50/-0) libmemcached/string.cc (+253/-0) libmemcached/string.h (+121/-0) libmemcached/touch.cc (+106/-0) libmemcached/touch.h (+59/-0) libmemcached/types.h (+117/-0) libmemcached/util.h (+40/-0) libmemcached/util/flush.cc (+61/-0) libmemcached/util/flush.h (+50/-0) libmemcached/util/include.am (+34/-0) libmemcached/util/ping.cc (+62/-0) libmemcached/util/ping.h (+49/-0) libmemcached/util/pool.cc (+392/-0) libmemcached/util/pool.h (+78/-0) libmemcached/util/version.cc (+87/-0) libmemcached/util/version.h (+53/-0) libmemcached/verbosity.cc (+97/-0) libmemcached/verbosity.h (+50/-0) libmemcached/version.cc (+214/-0) libmemcached/version.h (+52/-0) libmemcached/virtual_bucket.c (+118/-0) libmemcached/virtual_bucket.h (+59/-0) libmemcached/visibility.h (+51/-0) libmemcached/watchpoint.h (+110/-0) libtest/failed.cc (+75/-0) libtest/failed.h (+53/-0) libtest/include.am (+40/-0) libtest/server.c (+355/-0) libtest/server.h (+43/-0) libtest/test.c (+399/-0) libtest/test.h (+323/-0) libtest/visibility.h (+69/-0) m4/ac_cxx_compile_stdcxx_0x.m4 (+103/-0) m4/ac_cxx_header_stdcxx_98.m4 (+83/-0) m4/acx_pthread.m4 (+271/-0) m4/byteorder.m4 (+19/-0) m4/deprecated.m4 (+17/-0) m4/eagain.m4 (+28/-0) m4/enable_utillib.m4 (+16/-0) m4/gettext.m4 (+379/-0) m4/hsieh.m4 (+18/-0) m4/iconv.m4 (+214/-0) m4/lib-ld.m4 (+110/-0) m4/lib-link.m4 (+767/-0) m4/lib-prefix.m4 (+221/-0) m4/memaslap.m4 (+9/-0) m4/memcached.m4 (+31/-0) m4/murmur.m4 (+18/-0) m4/pandora_64bit.m4 (+60/-0) m4/pandora_bison.m4 (+33/-0) m4/pandora_canonical.m4 (+418/-0) m4/pandora_check_compiler_version.m4 (+37/-0) m4/pandora_check_cxx_standard.m4 (+23/-0) m4/pandora_cinttypes.m4 (+39/-0) m4/pandora_clock_gettime.m4 (+15/-0) m4/pandora_compile_stdcxx_0x.m4 (+103/-0) m4/pandora_cstdint.m4 (+38/-0) m4/pandora_cxx_demangle.m4 (+27/-0) m4/pandora_enable_dtrace.m4 (+60/-0) m4/pandora_ensure_gcc_version.m4 (+62/-0) m4/pandora_extensions.m4 (+16/-0) m4/pandora_fdatasync.m4 (+25/-0) m4/pandora_flex.m4 (+33/-0) m4/pandora_have_better_malloc.m4 (+66/-0) m4/pandora_have_boost.m4 (+93/-0) m4/pandora_have_gcc_atomics.m4 (+37/-0) m4/pandora_have_innodb.m4 (+41/-0) m4/pandora_have_libaio.m4 (+56/-0) m4/pandora_have_libavahi.m4 (+41/-0) m4/pandora_have_libbdb.m4 (+40/-0) m4/pandora_have_libboost_date_time.m4 (+46/-0) m4/pandora_have_libboost_filesystem.m4 (+47/-0) m4/pandora_have_libboost_iostreams.m4 (+49/-0) m4/pandora_have_libboost_options.m4 (+47/-0) m4/pandora_have_libboost_regex.m4 (+54/-0) m4/pandora_have_libboost_test.m4 (+45/-0) m4/pandora_have_libboost_thread.m4 (+54/-0) m4/pandora_have_libcassandra.m4 (+44/-0) m4/pandora_have_libcurl.m4 (+62/-0) m4/pandora_have_libdl.m4 (+51/-0) m4/pandora_have_libdrizzle.m4 (+61/-0) m4/pandora_have_libevent.m4 (+66/-0) m4/pandora_have_libgearman.m4 (+41/-0) m4/pandora_have_libgtest.m4 (+47/-0) m4/pandora_have_libhaildb.m4 (+43/-0) m4/pandora_have_libhashkit.m4 (+42/-0) m4/pandora_have_libinnodb.m4 (+64/-0) m4/pandora_have_libldap.m4 (+73/-0) m4/pandora_have_libmemcached.m4 (+106/-0) m4/pandora_have_libmysqlclient.m4 (+146/-0) m4/pandora_have_libndbclient.m4 (+80/-0) m4/pandora_have_libpcre.m4 (+73/-0) m4/pandora_have_libpq.m4 (+46/-0) m4/pandora_have_libpqxx.m4 (+44/-0) m4/pandora_have_libsqlite3.m4 (+42/-0) m4/pandora_have_libtokyocabinet.m4 (+54/-0) m4/pandora_have_libuuid.m4 (+55/-0) m4/pandora_have_libvbucket.m4 (+40/-0) m4/pandora_have_libxml2.m4 (+52/-0) m4/pandora_have_libz.m4 (+51/-0) m4/pandora_have_protobuf.m4 (+82/-0) m4/pandora_have_sasl.m4 (+133/-0) m4/pandora_have_thrift.m4 (+45/-0) m4/pandora_header_assert.m4 (+23/-0) m4/pandora_header_stdcxx_98.m4 (+83/-0) m4/pandora_intltool.m4 (+225/-0) m4/pandora_libtool.m4 (+25/-0) m4/pandora_optimize.m4 (+75/-0) m4/pandora_platform.m4 (+117/-0) m4/pandora_plugins.m4 (+62/-0) m4/pandora_print_callstack.m4 (+61/-0) m4/pandora_pthread.m4 (+258/-0) m4/pandora_python3_devel.m4 (+236/-0) m4/pandora_run_cpplint.m4 (+8/-0) m4/pandora_sasl.m4 (+133/-0) m4/pandora_shared_ptr.m4 (+59/-0) m4/pandora_stack_direction.m4 (+39/-0) m4/pandora_stl_hash.m4 (+94/-0) m4/pandora_swig.m4 (+39/-0) m4/pandora_use_pipe.m4 (+36/-0) m4/pandora_vc_build.m4 (+168/-0) m4/pandora_version.m4 (+11/-0) m4/pandora_visibility.m4 (+75/-0) m4/pandora_warnings.m4 (+447/-0) m4/pandora_with_gettext.m4 (+44/-0) m4/pandora_with_lua.m4 (+55/-0) m4/pandora_with_memcached.m4 (+41/-0) m4/pandora_with_perl.m4 (+81/-0) m4/pandora_with_php.m4 (+56/-0) m4/pandora_with_python.m4 (+37/-0) m4/pandora_with_python3.m4 (+44/-0) m4/pandora_with_r.m4 (+33/-0) m4/pandora_with_ruby.m4 (+79/-0) m4/pandora_with_valgrind.m4 (+17/-0) m4/pkg.m4 (+157/-0) m4/po.m4 (+449/-0) m4/progtest.m4 (+92/-0) m4/protocol_binary.m4 (+36/-0) m4/setsockopt.m4 (+73/-0) m4/socket_send_flags.m4 (+66/-0) poll/include.am (+8/-0) poll/poll.c (+77/-0) poll/poll.h (+45/-0) support/example.cnf (+10/-0) support/include.am (+11/-0) support/libmemcached-fc.spec.in (+105/-0) support/libmemcached.pc.in (+10/-0) support/libmemcached.spec.in (+281/-0) support/set_benchmark.sh (+5/-0) tests/atomsmasher.c (+296/-0) tests/basic.cc (+132/-0) tests/basic.h (+66/-0) tests/cpp_example.cc (+194/-0) tests/deprecated.cc (+73/-0) tests/deprecated.h (+49/-0) tests/error_conditions.cc (+63/-0) tests/error_conditions.h (+50/-0) tests/hash_plus.cc (+217/-0) tests/hash_results.h (+127/-0) tests/hashkit_functions.c (+602/-0) tests/include.am (+342/-0) tests/ketama_test_cases.h (+121/-0) tests/ketama_test_cases_spy.h (+118/-0) tests/libmemcached_world.h (+200/-0) tests/mem_functions.cc (+6581/-0) tests/mem_udp.c (+508/-0) tests/output_plus.res (+5/-0) tests/parser.cc (+599/-0) tests/parser.h (+111/-0) tests/plus.cpp (+240/-0) tests/pool.cc (+78/-0) tests/pool.h (+51/-0) tests/print.cc (+59/-0) tests/print.h (+51/-0) tests/r/memcat.res (+19/-0) tests/r/memcp.res (+27/-0) tests/r/memrm.res (+19/-0) tests/r/memslap.res (+33/-0) tests/r/memstat.res (+33/-0) tests/replication.cc (+334/-0) tests/replication.h (+64/-0) tests/start.c (+29/-0) tests/string.cc (+168/-0) tests/string.h (+69/-0) tests/t/memcat.test (+4/-0) tests/t/memcp.test (+3/-0) tests/t/memrm.test (+3/-0) tests/t/memslap.test (+5/-0) tests/t/memstat.test (+3/-0) tests/virtual_buckets.cc (+143/-0) tests/virtual_buckets.h (+53/-0) win32/include.am (+11/-0) win32/wrappers.h (+55/-0) Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. Conflict adding file .hgignore. Moved existing file to .hgignore.moved. Conflict adding file .quickly. Moved existing file to .quickly.moved. Conflict adding file AUTHORS. Moved existing file to AUTHORS.moved. Conflict adding file COPYING. Moved existing file to COPYING.moved. Conflict adding file ChangeLog. Moved existing file to ChangeLog.moved. Conflict adding file Makefile.am. Moved existing file to Makefile.am.moved. Conflict adding file NEWS. Moved existing file to NEWS.moved. Conflict adding file README.FIRST. Moved existing file to README.FIRST.moved. Conflict adding file README. Moved existing file to README.moved. Conflict adding file README.win32. Moved existing file to README.win32.moved. Conflict adding file THANKS. Moved existing file to THANKS.moved. Conflict adding file TODO. Moved existing file to TODO.moved. Conflict adding file clients. Moved existing file to clients.moved. Conflict adding file config. Moved existing file to config.moved. Conflict adding file configure.ac. Moved existing file to configure.ac.moved. Conflict adding file docs. Moved existing file to docs.moved. Conflict adding file example. Moved existing file to example.moved. Conflict adding file libhashkit. Moved existing file to libhashkit.moved. Conflict adding file libmemcached. Moved existing file to libmemcached.moved. Conflict adding file libtest. Moved existing file to libtest.moved. Conflict adding file m4. Moved existing file to m4.moved. Conflict adding file poll. Moved existing file to poll.moved. Conflict adding file support. Moved existing file to support.moved. Conflict adding file tests. Moved existing file to tests.moved. Conflict adding file win32. Moved existing file to win32.moved. |
To merge this branch: | bzr merge lp://qastaging/~avsej/libmemcached/touch-command |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Libmemcached-developers | Pending | ||
Review via email:
|
Commit message
Implemented TOUCH command
Description of the change
Hi guys
I implemented TOUCH command with tests which is implemented in membase/memcached server fork. Tests are skipping on original memcached and passing on membase's.
Kind regards,
Sergey Avseyev
To post a comment you must log in.
Unmerged revisions
- 951. By Sergey Avseyev
-
Implement TOUCH command
- 950. By Sergey Avseyev
-
Fix binary increment/decrement commands with prefix
- 949. By Brian Aker
-
Merge in conditional fix
- 948. By Brian Aker
-
Merge of trunk.
Is there way to test if a server is membase or not?
Sent from my C64
On Jun 23, 2011, at 12:17 AM, Sergey Avseyev <email address hidden> wrote:
> Sergey Avseyev has proposed merging lp:~avsej/libmemcached/touch-command into lp:libmemcached. developers (libmemcached- developers) /code.launchpad .net/~avsej/ libmemcached/ touch-command/ +merge/ 65623 /code.launchpad .net/~avsej/ libmemcached/ touch-command/ +merge/ 65623 developers is requested to review the proposed merge of lp:~avsej/libmemcached/touch-command into lp:libmemcached. config. guess +config/config.sub +config/depcomp +config/install-sh +config/ltmain.sh +config/missing +config/ pandora_ vc_revinfo +config/plugin.ac +config/top.h +configure +docs/*.[13] +docs/*.html +docs/conf.py +docs/conf.py +docs/doctest/ +docs/doctrees/ +docs/html/ +docs/linkcheck/ +example/ memcached_ light +libhashkit/ configure. h +libmemcached- *.tar.gz +libmemcached- 0.30-1. src.rpm +libmemcached- 0.30-1. x86_64. rpm +libmemcached- 0.31-1. src.rpm +libmemcached- 0.31-1. x86_64. rpm +libmemcached- 0.37-1. src.rpm +libmemcached- 0.37-1. x86_64. rpm +libmemcached-?.??/ +libmemcached/ configure. h +libmemcached/ dtrace_ probes. h +libmemcached/ generated_ probes. h +libmemcached/ memcached_ configure. h +libtool +libtool.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +lt~obsolete.m4 +patch +patch2 +stamp-h1 +support/Makefile +support/ Makefile. in +support/ libmemcached- fc.spec +support/ libmemcached. pc +support/ libmemcached. spec +tags +tests/atomsmasher +tests/hash_plus +tests/hashplus +tests/memplus +tests/output.cmp +tests/startservers +tests/testapp +tests/testhashkit +tests/testplus +tests/testudp +tests/var/ +unittests/ unittests === renamed file '.bzrignore' => '.bzrignore.moved' === added file '.hgignore' --- .hgignore 1970-01-01 00:00:00 +0000 +++ .hgignore 2011-06-23 07:17:28 +0000 @@ -0,0 +1,87 @@ +# Exact paths to config junk +^INSTALL$ +^aclocal.m4$ +^configure$ +^config/ (config. guess|config. sub|depcomp| install- sh|ltmain. sh|missing) $ +^config. (log|status) $ +^libtool$ +^autom4te.cache$ +^libmemcached/ (libmemcached_ config. h(.in)? |stamp- h1)$ +^libmemcached/ libmemcached_ config. h.in$ +^stamp-h1$ +^lib/libmemcac hedPlus. la$ +^tests/...
>
> Requested reviews:
> Libmemcached-
>
> For more details, see:
> https:/
>
> Hi guys
>
> I implemented TOUCH command with tests which is implemented in membase/memcached server fork. Tests are skipping on original memcached and passing on membase's.
>
>
> Kind regards,
> Sergey Avseyev
> --
> The attached diff has been truncated due to its size.
> https:/
> Your team Libmemcached-
> === added file '.bzrignore' --- .bzrignore 1970-01-01 00:00:00 +0000 +++ .bzrignore 2011-06-23 07:17:28 +0000 @@ -0,0 +1,100 @@ +*.BASE +*.OTHER +*.exe +*.lo +*.output +*.pop +*.rpm +*/*.l[oa] +*/*/*.l[oa] +*/*/.deps +*/*/.dirstamp +*/*/.libs +*/.deps +*/.dirstamp +*/.libs +*/Makefile +*/Makefile.in +*TAGS +.deps +INSTALL +Makefile +Makefile.in +TAGS +aclocal.m4 +autom4te.cache +clients/memaslap +clients/memcapable +clients/memcat +clients/memcp +clients/memdump +clients/memerror +clients/memflush +clients/memparse +clients/memrm +clients/memslap +clients/memstat +config.h +config.h.in +config.log +config.status +config/compile +config/