lp:~brianaker/libmemcached/1224951

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: 765 lines (+200/-123) (has conflicts)

21 files modified

bootstrap.sh (+45/-17)
clients/memcp.cc (+1/-1)
libmemcached/io.cc (+4/-4)
libmemcached/string.cc (+11/-9)
libtest/cmdline.cc (+1/-1)
libtest/core.cc (+2/-2)
libtest/cpu.cc (+5/-0)
libtest/main.cc (+9/-2)
libtest/unittest.cc (+5/-5)
m4/ax_debug.m4 (+4/-2)
m4/ax_harden_compiler_flags.m4 (+36/-0)
m4/ax_memcached.m4 (+10/-21)
m4/hiredis.m4 (+26/-34)
tests/libmemcached-1.0/plus.cpp (+7/-0)
tests/memcat.cc (+7/-5)
tests/memcp.cc (+4/-0)
tests/memdump.cc (+3/-2)
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

Bug #1224951: rindex undefined in libtest/main.cc

Medium

Fix Committed

Link a bug report

Related blueprints

1167. By Brian Aker on 2013-09-14

Add strings.h include

1166. By Tangent.Org Continuous Integration on 2013-09-14

Merge lp:~brianaker/libmemcached/check-update Build: jenkins-Libmemcached-334

1165. By Tangent.Org Continuous Integration on 2013-09-14

Merge lp:~brianaker/libmemcached/check-update Build: jenkins-Libmemcached-333

1164. By Tangent.Org Continuous Integration on 2013-07-19

Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-314

1163. By Tangent.Org Continuous Integration on 2013-05-03

Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-296

1162. By Tangent.Org Continuous Integration on 2013-04-30

Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-286

1161. By Tangent.Org Continuous Integration on 2013-04-21

Merge lp:~brianaker/libmemcached/exception-cleanup/ Build: jenkins-Libmemcached-272

1160. By Tangent.Org Continuous Integration on 2013-04-21

Merge lp:~brianaker/libmemcached/exception-cleanup Build: jenkins-Libmemcached-271

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

Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-268

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

Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-265