r31313 merge to 1.5.x has conflicts

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Tue, 22 Jul 2008 21:12:01 -0700

I ran into several conflicts while attempting to merge r31313 to 1.5.x this
evening. Could somebody with more knowledge of serf and/or this change create a
backport branch or perform the actual merge?

Thanks,
-Hyrum

application/pgp-signature attachment: OpenPGP digital signature

Received on 2008-07-23 06:12:26 CEST

This message: [ Message body ]
Next message: Chia-liang Kao: "Re: Do lock tokens need to be unique?"
Previous message: Hyrum K. Wright: "Re: SVN 1.5.1 this Wednesday. Please review and vote in STATUS"
Next in thread: Lieven Govaerts: "Re: r31313 merge to 1.5.x has conflicts"
Reply: Lieven Govaerts: "Re: r31313 merge to 1.5.x has conflicts"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]