lp:~brianaker/libmemcached/merge-of-1.0

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:libmemcached at revision 1109

Tangent Trunk: Pending requested 2013-10-11

Diff: 1745 lines (+475/-347)

39 files modified

bootstrap.sh (+15/-17)
clients/generator.cc (+5/-3)
clients/memcp.cc (+1/-1)
clients/memslap.cc (+5/-3)
clients/memtouch.cc (+1/-1)
clients/ms_setting.h (+1/-1)
docs/memcached_auto.rst (+4/-2)
libmemcached-1.2/deprecated_types.h (+1/-0)
libmemcached/auto.cc (+5/-0)
libmemcached/connect.cc (+1/-1)
libmemcached/error.cc (+138/-119)
libmemcached/get.cc (+15/-5)
libmemcached/io.cc (+9/-4)
libmemcached/io.hpp (+2/-1)
libmemcached/key.cc (+47/-23)
libmemcached/key.hpp (+0/-24)
libmemcached/response.cc (+10/-1)
libmemcached/stats.cc (+7/-6)
libmemcached/string.cc (+11/-9)
libmemcached/touch.cc (+2/-2)
libtest/cmdline.cc (+1/-1)
libtest/core.cc (+2/-2)
libtest/main.cc (+6/-3)
libtest/unittest.cc (+5/-5)
m4/ax_debug.m4 (+4/-2)
tests/cli.am (+9/-0)
tests/libmemcached-1.0/all_tests.h (+4/-2)
tests/libmemcached-1.0/mem_functions.cc (+113/-73)
tests/libmemcached-1.0/mem_functions.h (+2/-0)
tests/libmemcached-1.0/plus.cpp (+7/-0)
tests/libmemcached_world.h (+2/-0)
tests/libmemcached_world_socket.h (+3/-0)
tests/memcat.cc (+7/-5)
tests/memcp.cc (+4/-0)
tests/memdump.cc (+6/-13)
tests/memexist.cc (+8/-8)
tests/memping.cc (+2/-2)
tests/memrm.cc (+3/-1)
tests/memtouch.cc (+7/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1109. By Brian Aker on 2013-10-11

Merge of 1.0

1108. By Tangent.Org Continuous Integration on 2013-10-10

Merge lp:~mwhudson/libmemcached/misc-memaslap-fixes Build: jenkins-Libmemcached-366

1107. By Tangent.Org Continuous Integration on 2013-10-09

Merge lp:libmemcached Build: jenkins-Libmemcached-360

1106. By Tangent.Org Continuous Integration on 2013-09-16

Merge lp:~brianaker/libmemcached/update-m4-sept Build: jenkins-Libmemcached-345

1105. By Tangent.Org Continuous Integration on 2013-06-14

Merge lp:~brianaker/libmemcached/update-1.2 Build: jenkins-Libmemcached-312

1104. By Tangent.Org Continuous Integration on 2013-05-05

Merge lp:~tangent-org/libmemcached/1.2-build/ Build: jenkins-Libmemcached-299

1103. By Tangent.Org Continuous Integration on 2013-05-04

Merge lp:~tangent-org/libmemcached/1.2-build/ Build: jenkins-Libmemcached-297

1102. By Tangent.Org Continuous Integration on 2013-04-20

Merge lp:~brianaker/libmemcached/merge-1.0-april-2013 Build: jenkins-Libmemcached-270

1101. By Tangent.Org Continuous Integration on 2013-04-03

Merge lp:~tangent-org/libmemcached/1.2-build/ Build: jenkins-Libmemcached-250

1100. By Tangent.Org Continuous Integration on 2013-01-30

Merge lp:~tangent-org/libmemcached/1.2-build/ Build: jenkins-Libmemcached-221