Drizzle

Merge lp://qastaging/~mordred/drizzle/pre-rc-build-tweaks into lp://qastaging/drizzle/7.0

pre-rc-build-tweaks
Merge into 7.0

Proposed by Monty Taylor on 2011-02-14

Status:	Merged
Approved by:	Monty Taylor on 2011-02-14
Approved revision:	2172
Merged at revision:	2169
Proposed branch:	lp://qastaging/~mordred/drizzle/pre-rc-build-tweaks
Merge into:	lp://qastaging/drizzle/7.0
Diff against target:	294 lines (+83/-26) 9 files modified docs/include.am (+1/-1) drizzled/daemon.cc (+19/-15) drizzled/daemon.h (+45/-0) drizzled/include.am (+2/-1) drizzled/main.cc (+2/-4) drizzled/util/backtrace.h (+3/-0) m4/pandora_warnings.m4 (+7/-2) plugin/debug/plugin.ini (+2/-2) po/Makefile.in.in (+2/-1)
To merge this branch:	bzr merge lp://qastaging/~mordred/drizzle/pre-rc-build-tweaks
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Lee Bieber (community)		2011-02-14	Needs Fixing on 2011-02-15
Review via email: mp+49720@code.qastaging.launchpad.net

Description of the change

A few minor things to get in before the RC tarball. Mainly allows us to stop patching drizzle in the deb packagin.

lp://qastaging/~mordred/drizzle/pre-rc-build-tweaks updated on 2011-02-14

2173. By Monty Taylor on 2011-02-14: Making debug plugin non-static made us need to expose a symbol.

Revision history for this message

Lee Bieber (kalebral-deactivatedaccount) wrote on 2011-02-15:

build broken on hades and a few other platforms

http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-hades/1211/console

review: Needs Fixing

Revision history for this message

Monty Taylor (mordred) wrote on 2011-02-15:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 02/14/2011 05:29 PM, Lee Bieber wrote:
> Review: Needs Fixing
> build broken on hades and a few other platforms
>
> http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-hades/1211/console

Taking care of right now. Sorry.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1Z3AUACgkQ2Jv7/VK1RgFx5ACaAxMm2qLAnlDoel+LynCd8iQw
GuEAoOqbPPZsipsl1jODwe4l3VOgtwnB
=RLRC
-----END PGP SIGNATURE-----

Revision history for this message

Monty Taylor (mordred) wrote on 2011-02-15:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 02/14/2011 05:51 PM, Monty Taylor wrote:
> On 02/14/2011 05:29 PM, Lee Bieber wrote:
>> Review: Needs Fixing
>> build broken on hades and a few other platforms
>
>> http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-hades/1211/console
>
> Taking care of right now. Sorry.

Ok. I pushed fixes back in to lp:drizzle/build which should fix this.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1Z3J8ACgkQ2Jv7/VK1RgFoyQCgyMUKbKx1CaB1HIhzs8VQAbCY
YmgAoOsNtlSS7oTMqTTpiUvQCNbH4c53
=+0q3
-----END PGP SIGNATURE-----