lp:~brianaker/libmemcached/merge-1.0-april-2013

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:libmemcached at revision 1102

Tangent Trunk: Pending requested 2013-04-20

Diff: 1410 lines (+436/-154)

32 files modified

bootstrap.sh (+151/-23)
clients/memflush.cc (+1/-1)
clients/memping.cc (+1/-1)
clients/memrm.cc (+1/-1)
libmemcached/connect.cc (+5/-2)
libtest/cmdline.cc (+27/-24)
libtest/cmdline.h (+0/-3)
libtest/common.h (+1/-1)
libtest/dream.cc (+1/-1)
libtest/drizzled.cc (+5/-5)
libtest/framework.cc (+1/-1)
libtest/framework.h (+1/-1)
libtest/has.cc (+50/-4)
libtest/has.hpp (+9/-1)
libtest/include.am (+13/-2)
libtest/lite.h (+2/-10)
libtest/main.cc (+2/-3)
libtest/memcached.cc (+5/-5)
libtest/memcached.hpp (+1/-1)
libtest/result.cc (+1/-0)
libtest/run-ci.gdb (+1/-0)
libtest/run.gdb (+1/-0)
libtest/server_container.cc (+7/-5)
libtest/signal.cc (+3/-7)
libtest/unittest.cc (+9/-0)
libtest/valgrind.h (+55/-0)
libtest/vchar.cc (+5/-0)
libtest/vchar.hpp (+3/-0)
m4/ax_harden_compiler_flags.m4 (+66/-48)
tests/keys.hpp (+3/-3)
tests/libmemcached-1.0/mem_functions.cc (+1/-1)
tests/libmemcached-1.0/sasl.cc (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1103. By Brian Aker on 2013-04-20

Merge the rest of 1.0.

1102. By Brian Aker on 2013-04-20

First pass, merge 1.0

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

1099. By Tangent.Org Continuous Integration on 2013-01-28

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

1098. By Tangent.Org Continuous Integration on 2013-01-20

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

1097. By Tangent.Org Continuous Integration on 2013-01-18

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

1096. By Tangent.Org Continuous Integration on 2013-01-16

Merge lp:libmemcached/1.0 Build: jenkins-Libmemcached-201

1095. By Tangent.Org Continuous Integration on 2013-01-14

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

1094. By Tangent.Org Continuous Integration on 2013-01-11

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