On Tue, Nov 19, 2013 at 08:08:26AM +0100, Willy Tarreau wrote: > Hi Simon, > > On Tue, Nov 19, 2013 at 12:45:50PM +0900, Simon Horman wrote: > > On Mon, Nov 18, 2013 at 07:36:58AM +0100, Willy Tarreau wrote: > > > On Mon, Nov 18, 2013 at 03:22:33PM +0900, Simon Horman wrote: > > > > On Mon, Nov 18, 2013 at 06:45:41AM +0100, Willy Tarreau wrote: > > > > > Hi Simon, > > > > > > > > > > On Tue, Nov 05, 2013 at 06:04:31PM +0900, Simon Horman wrote: > > > > > > Hi, > > > > > > > > > > > > This series is a revised subset of > > > > > > "[PATCH v6 00/22] Agent Check Enhancements and External Check". > > > > > > I have broken it out as a smaller set of patches to allow > > > > > > review to be done in smaller chunks. > > > > > > > > > > > > Although these patches aren't particularly useful in their own right > > > > > > they also should not break anything and were positively reviewed > > > > > > when last posted. > > > > > > > > > > Just finished reviewing them, these patches look OK to me. Do you > > > > > want me to merge them now ? > > > > > > > > Yes, please merge them. > > > > > > OK, but I just tried and they fail. I think they rely n the first > > > series which creates the server's check element and move *inter > > > there (3/22 and 4/22 in v6). Presumably you have them in your tree :-) > > > > > > They were OK so feel free to send me what is needed before these ones > > > and I'll merge them at the same time. > > > > Hi, > > > > I'm a little unclear on the way in which the series failed. > > But perhaps the problem can be resolved by applying the following > > before the series: > > > > "CLEANUP: Make parameters of srv_downtime and srv_getinter const" > > No it's different here. > > The patch set relies on the struct check to have been moved away from > struct server, which was achieved by patches 3/22 and 4/22 in v6 and > which is found in commit 7de4304d561 in your tree. > > I can pick the patch from your tree but I preferred to let you know > the anomaly in case there's a bigger issue. But I suspect that you > simply did a git-format-patch 7de4304d561.. instead of 7de4304d561^..
Thanks, yes, I think that is the case. Sorry for the error. > > Sorry for indicating that patch is a dependency of the series. > > I didn't notice this one was not merged yet, thanks for the precisions. > It's always best to assume that whatever is not merged was not found > and to send it with the series. And it will force me to comment if I > had a reason to disagree :-) > > > I have provided it below for reference. > > Thank you, I've applied it now. Great, thanks. > So please just tell me if you want me to simply pick all these > patches from your tree, in which case I will simply do that (I'm > OK as well with the first one) : > > 7de4304 MEDIUM: Split up struct server's check element > af7c148 MEDIUM: Move result element to struct check > df343a7 MEDIUM: Paramatise functions over the check of a server > 5dd7035 MEDIUM: cfgparse: Factor out check initialisation > e982639 MEDIUM: Add state to struct check > 433d418 MEDIUM: Move health element to struct check Yes, please do.
