lp:~brianaker/gearmand/fixes-for-ssl-builds

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:gearmand at revision 824

Tangent Trunk: Pending requested 2013-07-11

Diff: 1207 lines (+334/-232)

26 files modified

libgearman-1.0/constants.h (+2/-1)
libgearman-server/connection.cc (+13/-10)
libgearman-server/connection.h (+2/-2)
libgearman-server/gearmand.cc (+13/-18)
libgearman-server/gearmand_thread.cc (+4/-10)
libgearman-server/io.cc (+40/-44)
libgearman-server/io.h (+5/-3)
libgearman-server/plugins/protocol/gear/protocol.cc (+26/-3)
libgearman-server/server.cc (+5/-2)
libgearman-server/struct/gearmand_thread.h (+6/-1)
libgearman-server/thread.cc (+5/-8)
libgearman/check.h (+5/-0)
libgearman/client.cc (+26/-30)
libgearman/client.hpp (+3/-3)
libgearman/function/function_v2.cc (+2/-1)
libgearman/interface/universal.hpp (+4/-0)
libgearman/interface/worker.hpp (+5/-0)
libgearman/job.cc (+19/-2)
libgearman/strcommand.h (+8/-0)
libgearman/universal.cc (+7/-0)
libgearman/worker.cc (+87/-71)
libgearman/worker.hpp (+21/-0)
tests/libgearman-1.0/gearman_execute_partition.cc (+8/-8)
tests/protocol.cc (+3/-0)
tests/start_worker.cc (+10/-9)
tests/workers/v2/split.cc (+5/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

826. By Brian Aker on 2013-07-11

Fix additional OSX warnings.

825. By Brian Aker on 2013-07-11

Additional OSX fix.

824. By Brian Aker on 2013-07-11

OSX build fixes.

823. By Brian Aker on 2013-07-11

Merge with trunk.

822. By Tangent.Org Continuous Integration on 2013-07-10

Merge lp:~dshrews/gearmand/admin_ssl Build: jenkins-Gearmand-730

821. By Tangent.Org Continuous Integration on 2013-07-10

Merge lp:~brianaker/gearmand/clocktime-option-check-fixes Build: jenkins-Gearmand-728

820. By Tangent.Org Continuous Integration on 2013-07-10

Merge lp:~brianaker/gearmand/clocktime-option-check-fixes Build: jenkins-Gearmand-727

819. By Tangent.Org Continuous Integration on 2013-07-09

Merge lp:~dshrews/gearmand/gearman_cli_ssl Build: jenkins-Gearmand-723

818. By Tangent.Org Continuous Integration on 2013-07-09

Merge lp:~brianaker/gearmand/remove-dead-target Build: jenkins-Gearmand-722

817. By Tangent.Org Continuous Integration on 2013-07-08

Merge lp:~brianaker/gearmand/error-message-cleanup2 Build: jenkins-Gearmand-721