lp:~brianaker/drizzle/pid-file-fix

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~drizzle-trunk/drizzle/development at revision 2532

Olaf van der Spek (community): Needs Fixing on 2012-03-19

Drizzle Merge Team: Pending requested 2012-03-18

Diff: 372 lines (+102/-71)

3 files modified

drizzled/drizzled.cc (+88/-30)
drizzled/main.cc (+5/-3)
plugin/signal_handler/signal_handler.cc (+9/-38)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2528. By Brian Aker on 2012-03-18

Merge of create pid bug fix.

2527. By Tangent.Org Continuous Integration on 2012-03-15

modified:
  tests/kewpie/randgen/lib/GenTest/Incident.pm
  tests/kewpie/randgen/lib/GenTest/Reporter/Backtrace.pm
  tests/kewpie/randgen/lib/GenTest/Reporter/ReplicationSemiSync.pm
  tests/kewpie/randgen/lib/GenTest/XML/BuildInfo.pm
  tests/kewpie/randgen/lib/GenTest/XML/Environment.pm
  tests/kewpie/randgen/lib/GenTest/XML/Report.pm
  tests/kewpie/randgen/lib/GenTest/XML/Test.pm
  tests/kewpie/randgen/lib/GenTest/XML/Transporter.pm
  tests/kewpie/randgen/pb2runtest.pl
  tests/kewpie/randgen/t/test.bat
pending merge tips: (use -v to see all merge revisions)
  Olaf van der Spek 2012-03-14 Fix EOLs

2526. By Tangent.Org Continuous Integration on 2012-03-14

Merging bzr://localhost/drizzle/show to Build branch

2525. By Drizzle Continuous Integration on 2012-03-10

Merge staging tree to trunk.

2524. By Drizzle Continuous Integration on 2012-03-09

Merge staging tree to trunk.

2523. By Drizzle Continuous Integration on 2012-03-08

Merge staging tree to trunk.

2522. By Drizzle Continuous Integration on 2012-03-06

Merge staging tree to trunk.

2521. By Drizzle Continuous Integration on 2012-03-06

Merge staging tree to trunk.

2520. By Drizzle Continuous Integration on 2012-03-05

Merge staging tree to trunk.

2519. By Drizzle Continuous Integration on 2012-03-04

Merge staging tree to trunk.