Ian Murray
2013-Jun-22 12:38 UTC
[PATCH] Xendomains was not correctly suspending domains when a STOP was issued.
The regex was not selecting the { when parsing JSON output of xl list -l. It was also not selecting (domain when parsing xl list -l when SXP selected. Pefixed { with 4 spaces, and removed an extra ( before domain in the regex string Added quotes around the grep strings so the spaces inserted into the string didn''t not break the grepping. This has now been tested against 4.3RC5 Signed-off-by: Ian Murray <murrayie@yahoo.co.uk> --- tools/hotplug/Linux/init.d/xendomains | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains index 730541e..38371af 100644 --- a/tools/hotplug/Linux/init.d/xendomains +++ b/tools/hotplug/Linux/init.d/xendomains @@ -206,7 +206,7 @@ rdnames() done } -LIST_GREP=''((domain\|(domid\|(name\|^{$\|"name":\|"domid":'' +LIST_GREP=''(domain\|(domid\|(name\|^ {$\|"name":\|"domid":'' parseln() { if [[ "$1" =~ ''(domain'' ]] || [[ "$1" = "{" ]]; then @@ -237,7 +237,7 @@ is_running() RC=0 ;; esac - done < <($CMD list -l | grep $LIST_GREP) + done < <($CMD list -l | grep "$LIST_GREP") return $RC } @@ -319,7 +319,7 @@ all_zombies() if test "$state" != "-b---d" -a "$state" != "-----d"; then return 1; fi - done < <($CMD list -l | grep $LIST_GREP) + done < <($CMD list -l | grep "$LIST_GREP") return 0 } @@ -450,7 +450,7 @@ stop() fi kill $WDOG_PID >/dev/null 2>&1 fi - done < <($CMD list -l | grep $LIST_GREP) + done < <($CMD list -l | grep "$LIST_GREP") # NB. this shuts down ALL Xen domains (politely), not just the ones in # AUTODIR/* @@ -487,7 +487,7 @@ check_domain_up() return 0 ;; esac - done < <($CMD list -l | grep $LIST_GREP) + done < <($CMD list -l | grep "$LIST_GREP") return 1 } -- 1.7.9.5
George Dunlap
2013-Jun-24 10:50 UTC
Re: [PATCH] Xendomains was not correctly suspending domains when a STOP was issued.
On Sat, Jun 22, 2013 at 1:38 PM, Ian Murray <murrayie@yahoo.co.uk> wrote:> The regex was not selecting the { when parsing JSON output of xl list -l. > It was also not selecting (domain when parsing xl list -l when SXP selected. > > Pefixed { with 4 spaces, and removed an extra ( before domain in the regex > string > > Added quotes around the grep strings so the spaces inserted into the string > didn''t not break the grepping. > > This has now been tested against 4.3RC5 > > Signed-off-by: Ian Murray <murrayie@yahoo.co.uk>IanC, is this a candidate for 4.3? -George
Ian Murray
2013-Jun-24 14:36 UTC
Re: [PATCH] Xendomains was not correctly suspending domains when a STOP was issued.
----- Original Message -----> From: George Dunlap <dunlapg@umich.edu> > To: Ian Murray <murrayie@yahoo.co.uk> > Cc: Ian Campbell <Ian.Campbell@citrix.com>; "xen-devel@lists.xen.org" <xen-devel@lists.xen.org> > Sent: Monday, 24 June 2013, 11:50 > Subject: Re: [Xen-devel] [PATCH] Xendomains was not correctly suspendingdomains when a STOP was issued.> > On Sat, Jun 22, 2013 at 1:38 PM, Ian Murray <murrayie@yahoo.co.uk> wrote: >> The regex was not selecting the { when parsing JSON output of xl list -l. >> It was also not selecting (domain when parsing xl list -l when SXP > selected. >> >> Pefixed { with 4 spaces, and removed an extra ( before domain in the regex >> string >> >> Added quotes around the grep strings so the spaces inserted into the string >> didn''t not break the grepping. >> >> This has now been tested against 4.3RC5 >> >> Signed-off-by: Ian Murray <murrayie@yahoo.co.uk> > > IanC, is this a candidate for 4.3?The background to this issue was discussion on a thread entitled "DomU suspension/hibernation" on the user''s list, towards the latter end of the thread. The principal behind the patch was discussed by Ian C at 19 Jun 2013 10:51 and afterwards. Hope that gives a little context.> > -George > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel >
Ian Murray
2013-Jun-26 21:41 UTC
Re: [PATCH] [Reminder] Xendomains was not correctly suspending domains when a STOP was issued.
I was under the impression that this in line for 4.3 RC6 but as of yet, I am not seeing it in git. Maybe it''s queued, in which case ignore this or if it''s been forgotten, then please don''t ignore this. :) Thanks, Ian On 22/06/13 13:38, Ian Murray wrote:> The regex was not selecting the { when parsing JSON output of xl list -l. > It was also not selecting (domain when parsing xl list -l when SXP selected. > > Pefixed { with 4 spaces, and removed an extra ( before domain in the regex > string > > Added quotes around the grep strings so the spaces inserted into the string > didn''t not break the grepping. > > This has now been tested against 4.3RC5 > > Signed-off-by: Ian Murray <murrayie@yahoo.co.uk> > --- > tools/hotplug/Linux/init.d/xendomains | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains > index 730541e..38371af 100644 > --- a/tools/hotplug/Linux/init.d/xendomains > +++ b/tools/hotplug/Linux/init.d/xendomains > @@ -206,7 +206,7 @@ rdnames() > done > } > > -LIST_GREP=''((domain\|(domid\|(name\|^{$\|"name":\|"domid":'' > +LIST_GREP=''(domain\|(domid\|(name\|^ {$\|"name":\|"domid":'' > parseln() > { > if [[ "$1" =~ ''(domain'' ]] || [[ "$1" = "{" ]]; then > @@ -237,7 +237,7 @@ is_running() > RC=0 > ;; > esac > - done < <($CMD list -l | grep $LIST_GREP) > + done < <($CMD list -l | grep "$LIST_GREP") > return $RC > } > > @@ -319,7 +319,7 @@ all_zombies() > if test "$state" != "-b---d" -a "$state" != "-----d"; then > return 1; > fi > - done < <($CMD list -l | grep $LIST_GREP) > + done < <($CMD list -l | grep "$LIST_GREP") > return 0 > } > > @@ -450,7 +450,7 @@ stop() > fi > kill $WDOG_PID >/dev/null 2>&1 > fi > - done < <($CMD list -l | grep $LIST_GREP) > + done < <($CMD list -l | grep "$LIST_GREP") > > # NB. this shuts down ALL Xen domains (politely), not just the ones in > # AUTODIR/* > @@ -487,7 +487,7 @@ check_domain_up() > return 0 > ;; > esac > - done < <($CMD list -l | grep $LIST_GREP) > + done < <($CMD list -l | grep "$LIST_GREP") > return 1 > } >
Ian Campbell
2013-Jun-27 08:07 UTC
Re: [PATCH] [Reminder] Xendomains was not correctly suspending domains when a STOP was issued.
It''s in my queue. I don''t know if it will make rc6 but it''ll get in. On Wed, 2013-06-26 at 22:41 +0100, Ian Murray wrote:> I was under the impression that this in line for 4.3 RC6 but as of yet, > I am not seeing it in git. Maybe it''s queued, in which case ignore this > or if it''s been forgotten, then please don''t ignore this. :) > > Thanks, > > Ian > > > > On 22/06/13 13:38, Ian Murray wrote: > > The regex was not selecting the { when parsing JSON output of xl list -l. > > It was also not selecting (domain when parsing xl list -l when SXP selected. > > > > Pefixed { with 4 spaces, and removed an extra ( before domain in the regex > > string > > > > Added quotes around the grep strings so the spaces inserted into the string > > didn''t not break the grepping. > > > > This has now been tested against 4.3RC5 > > > > Signed-off-by: Ian Murray <murrayie@yahoo.co.uk> > > --- > > tools/hotplug/Linux/init.d/xendomains | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains > > index 730541e..38371af 100644 > > --- a/tools/hotplug/Linux/init.d/xendomains > > +++ b/tools/hotplug/Linux/init.d/xendomains > > @@ -206,7 +206,7 @@ rdnames() > > done > > } > > > > -LIST_GREP=''((domain\|(domid\|(name\|^{$\|"name":\|"domid":'' > > +LIST_GREP=''(domain\|(domid\|(name\|^ {$\|"name":\|"domid":'' > > parseln() > > { > > if [[ "$1" =~ ''(domain'' ]] || [[ "$1" = "{" ]]; then > > @@ -237,7 +237,7 @@ is_running() > > RC=0 > > ;; > > esac > > - done < <($CMD list -l | grep $LIST_GREP) > > + done < <($CMD list -l | grep "$LIST_GREP") > > return $RC > > } > > > > @@ -319,7 +319,7 @@ all_zombies() > > if test "$state" != "-b---d" -a "$state" != "-----d"; then > > return 1; > > fi > > - done < <($CMD list -l | grep $LIST_GREP) > > + done < <($CMD list -l | grep "$LIST_GREP") > > return 0 > > } > > > > @@ -450,7 +450,7 @@ stop() > > fi > > kill $WDOG_PID >/dev/null 2>&1 > > fi > > - done < <($CMD list -l | grep $LIST_GREP) > > + done < <($CMD list -l | grep "$LIST_GREP") > > > > # NB. this shuts down ALL Xen domains (politely), not just the ones in > > # AUTODIR/* > > @@ -487,7 +487,7 @@ check_domain_up() > > return 0 > > ;; > > esac > > - done < <($CMD list -l | grep $LIST_GREP) > > + done < <($CMD list -l | grep "$LIST_GREP") > > return 1 > > } > > >
Ian Campbell
2013-Jun-27 11:32 UTC
Re: [PATCH] Xendomains was not correctly suspending domains when a STOP was issued.
On Sat, 2013-06-22 at 13:38 +0100, Ian Murray wrote:> The regex was not selecting the { when parsing JSON output of xl list -l. > It was also not selecting (domain when parsing xl list -l when SXP selected. > > Pefixed { with 4 spaces, and removed an extra ( before domain in the regex > string > > Added quotes around the grep strings so the spaces inserted into the string > didn''t not break the grepping. > > This has now been tested against 4.3RC5I also tested on current staging with xl (json), xl (sxp) and xm (sxp) with two domains and it worked fine where previously the xl json case would try and suspend the same domain twice (I didn''t bother testing the old case for the other two at that point).> Signed-off-by: Ian Murray <murrayie@yahoo.co.uk>Acked-by: Ian Campbell <ian.campbell@citrix.com> And applied.> --- > tools/hotplug/Linux/init.d/xendomains | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains > index 730541e..38371af 100644 > --- a/tools/hotplug/Linux/init.d/xendomains > +++ b/tools/hotplug/Linux/init.d/xendomains > @@ -206,7 +206,7 @@ rdnames() > done > } > > -LIST_GREP=''((domain\|(domid\|(name\|^{$\|"name":\|"domid":'' > +LIST_GREP=''(domain\|(domid\|(name\|^ {$\|"name":\|"domid":'' > parseln() > { > if [[ "$1" =~ ''(domain'' ]] || [[ "$1" = "{" ]]; then > @@ -237,7 +237,7 @@ is_running() > RC=0 > ;; > esac > - done < <($CMD list -l | grep $LIST_GREP) > + done < <($CMD list -l | grep "$LIST_GREP") > return $RC > } > > @@ -319,7 +319,7 @@ all_zombies() > if test "$state" != "-b---d" -a "$state" != "-----d"; then > return 1; > fi > - done < <($CMD list -l | grep $LIST_GREP) > + done < <($CMD list -l | grep "$LIST_GREP") > return 0 > } > > @@ -450,7 +450,7 @@ stop() > fi > kill $WDOG_PID >/dev/null 2>&1 > fi > - done < <($CMD list -l | grep $LIST_GREP) > + done < <($CMD list -l | grep "$LIST_GREP") > > # NB. this shuts down ALL Xen domains (politely), not just the ones in > # AUTODIR/* > @@ -487,7 +487,7 @@ check_domain_up() > return 0 > ;; > esac > - done < <($CMD list -l | grep $LIST_GREP) > + done < <($CMD list -l | grep "$LIST_GREP") > return 1 > } >
Ian Murray
2013-Jun-27 11:51 UTC
Re: [PATCH] Xendomains was not correctly suspending domains when a STOP was issued.
----- Original Message -----> From: Ian Campbell <Ian.Campbell@citrix.com> > To: Ian Murray <murrayie@yahoo.co.uk> > Cc: xen-devel@lists.xen.org > Sent: Thursday, 27 June 2013, 12:32 > Subject: Re: [Xen-devel] [PATCH] Xendomains was not correctly suspendingdomains when a STOP was issued.> > On Sat, 2013-06-22 at 13:38 +0100, Ian Murray wrote: >> The regex was not selecting the { when parsing JSON output of xl list -l. >> It was also not selecting (domain when parsing xl list -l when SXP > selected. >> >> Pefixed { with 4 spaces, and removed an extra ( before domain in the regex >> string >> >> Added quotes around the grep strings so the spaces inserted into the string >> didn''t not break the grepping. >> >> This has now been tested against 4.3RC5 > > I also tested on current staging with xl (json), xl (sxp) and xm (sxp) > with two domains and it worked fine where previously the xl json case > would try and suspend the same domain twice (I didn''t bother testing the > old case for the other two at that point). >Thanks. BTW, the JSON output of 4.3 looked the same to me as 4.2.2 (i.e. badly formed), so I am not sure the patch you mentioned to make it well-formed was in as of 4.3 RC5. if/when the well formed patch is introduced (if it isn''t already), it may very well break this (xendomains) patch.>> Signed-off-by: Ian Murray <murrayie@yahoo.co.uk> > > Acked-by: Ian Campbell <ian.campbell@citrix.com> > > And applied. >Thanks. Have a good release. :)>> --- >> tools/hotplug/Linux/init.d/xendomains | 10 +++++----- >> 1 file changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/tools/hotplug/Linux/init.d/xendomains > b/tools/hotplug/Linux/init.d/xendomains >> index 730541e..38371af 100644 >> --- a/tools/hotplug/Linux/init.d/xendomains >> +++ b/tools/hotplug/Linux/init.d/xendomains >> @@ -206,7 +206,7 @@ rdnames() >> done >> } >> >> > -LIST_GREP=''((domain\|(domid\|(name\|^{$\|"name":\|"domid":'' >> +LIST_GREP=''(domain\|(domid\|(name\|^ > {$\|"name":\|"domid":'' >> parseln() >> { >> if [[ "$1" =~ ''(domain'' ]] || [[ "$1" = > "{" ]]; then >> @@ -237,7 +237,7 @@ is_running() >> RC=0 >> ;; >> esac >> - done < <($CMD list -l | grep $LIST_GREP) >> + done < <($CMD list -l | grep "$LIST_GREP") >> return $RC >> } >> >> @@ -319,7 +319,7 @@ all_zombies() >> if test "$state" != "-b---d" -a "$state" > != "-----d"; then >> return 1; >> fi >> - done < <($CMD list -l | grep $LIST_GREP) >> + done < <($CMD list -l | grep "$LIST_GREP") >> return 0 >> } >> >> @@ -450,7 +450,7 @@ stop() >> fi >> kill $WDOG_PID >/dev/null 2>&1 >> fi >> - done < <($CMD list -l | grep $LIST_GREP) >> + done < <($CMD list -l | grep "$LIST_GREP") >> >> # NB. this shuts down ALL Xen domains (politely), not just the ones in >> # AUTODIR/* >> @@ -487,7 +487,7 @@ check_domain_up() >> return 0 >> ;; >> esac >> - done < <($CMD list -l | grep $LIST_GREP) >> + done < <($CMD list -l | grep "$LIST_GREP") >> return 1 >> } >> > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel >
Ian Campbell
2013-Jun-27 11:59 UTC
Re: [PATCH] Xendomains was not correctly suspending domains when a STOP was issued.
On Thu, 2013-06-27 at 12:51 +0100, Ian Murray wrote:> Thanks. BTW, the JSON output of 4.3 looked the same to me as 4.2.2 > (i.e. badly formed), so I am not sure the patch you mentioned to make > it well-formed was in as of 4.3 RC5. if/when the well formed patch is > introduced (if it isn''t already), it may very well break this > (xendomains) patch.Looks like I was mistaken and that fix was already in 4.2.0 (rc4 to be precise). commit ac963eb7895b8351017bb6005505c2b176202f0e Author: Ian Campbell <ian.campbell@citrix.com> Date: Thu Aug 23 19:12:28 2012 +0100 xl: make "xl list -l" proper JSON Bastian Blank reports that the output of this command is just multiple JSON objects concatenated and is not a single properly formed JSON object. Fix this by wrapping in an array. This turned out to be a bit more intrusive than I was expecting due to the requirement to keep supporting the SXP output mode. Python''s json module is happy to parse the result... Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Ian.
Ian Murray
2013-Jun-27 12:15 UTC
Re: [PATCH] Xendomains was not correctly suspending domains when a STOP was issued.
----- Original Message -----> From: Ian Campbell <Ian.Campbell@citrix.com> > To: Ian Murray <murrayie@yahoo.co.uk> > Cc: "xen-devel@lists.xen.org" <xen-devel@lists.xen.org> > Sent: Thursday, 27 June 2013, 12:59 > Subject: Re: [Xen-devel] [PATCH] Xendomains was not correctly suspendingdomains when a STOP was issued.> > On Thu, 2013-06-27 at 12:51 +0100, Ian Murray wrote: >> Thanks. BTW, the JSON output of 4.3 looked the same to me as 4.2.2 >> (i.e. badly formed), so I am not sure the patch you mentioned to make >> it well-formed was in as of 4.3 RC5. if/when the well formed patch is >> introduced (if it isn''t already), it may very well break this >> (xendomains) patch. > > Looks like I was mistaken and that fix was already in 4.2.0 (rc4 to be > precise).Yeah, according to http://jsonlint.com/ the output is valid. I thought it needed a left-hand object name to be valid, but it seems I was wrong. Anyway, it''is all good. Thanks. p.s. Looks like this patch missed RC6 by 40 minutes. :( .> > commit ac963eb7895b8351017bb6005505c2b176202f0e > Author: Ian Campbell <ian.campbell@citrix.com> > Date: Thu Aug 23 19:12:28 2012 +0100 > > xl: make "xl list -l" proper JSON > > Bastian Blank reports that the output of this command is just multiple > JSON objects concatenated and is not a single properly formed JSON > object. > > Fix this by wrapping in an array. This turned out to be a bit more > intrusive than I was expecting due to the requirement to keep > supporting the SXP output mode. > > Python''s json module is happy to parse the result... > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> > > Ian. >
Ian Campbell
2013-Jun-27 12:19 UTC
Re: [PATCH] Xendomains was not correctly suspending domains when a STOP was issued.
On Thu, 2013-06-27 at 13:15 +0100, Ian Murray wrote:> > > > ----- Original Message ----- > > From: Ian Campbell <Ian.Campbell@citrix.com> > > To: Ian Murray <murrayie@yahoo.co.uk> > > Cc: "xen-devel@lists.xen.org" <xen-devel@lists.xen.org> > > Sent: Thursday, 27 June 2013, 12:59 > > Subject: Re: [Xen-devel] [PATCH] Xendomains was not correctly suspending > domains when a STOP was issued. > > > > On Thu, 2013-06-27 at 12:51 +0100, Ian Murray wrote: > >> Thanks. BTW, the JSON output of 4.3 looked the same to me as 4.2.2 > >> (i.e. badly formed), so I am not sure the patch you mentioned to make > >> it well-formed was in as of 4.3 RC5. if/when the well formed patch is > >> introduced (if it isn''t already), it may very well break this > >> (xendomains) patch. > > > > Looks like I was mistaken and that fix was already in 4.2.0 (rc4 to be > > precise). > > Yeah, according to http://jsonlint.com/ the output is valid. I thought it needed a left-hand object name to be valid, but it seems I was wrong. Anyway, it''is all good. > > Thanks. > > p.s. Looks like this patch missed RC6 by 40 minutes. :(Actually rc6 effectively happened last night, since the commits made then needed to pass testing before they could be considered an rc. Ian.
Ian Murray
2013-Jun-27 12:30 UTC
Re: [PATCH] Xendomains was not correctly suspending domains when a STOP was issued.
----- Original Message -----> From: Ian Campbell <Ian.Campbell@citrix.com> > To: Ian Murray <murrayie@yahoo.co.uk> > Cc: "xen-devel@lists.xen.org" <xen-devel@lists.xen.org> > Sent: Thursday, 27 June 2013, 13:19 > Subject: Re: [Xen-devel] [PATCH] Xendomains was not correctly suspendingdomains when a STOP was issued.> > On Thu, 2013-06-27 at 13:15 +0100, Ian Murray wrote: >> >> >> >> ----- Original Message ----- >> > From: Ian Campbell <Ian.Campbell@citrix.com> >> > To: Ian Murray <murrayie@yahoo.co.uk> >> > Cc: "xen-devel@lists.xen.org" > <xen-devel@lists.xen.org> >> > Sent: Thursday, 27 June 2013, 12:59 >> > Subject: Re: [Xen-devel] [PATCH] Xendomains was not correctly > suspending >> domains when a STOP was issued. >> > >> > On Thu, 2013-06-27 at 12:51 +0100, Ian Murray wrote: >> >> Thanks. BTW, the JSON output of 4.3 looked the same to me as > 4.2.2 >> >> (i.e. badly formed), so I am not sure the patch you mentioned to > make >> >> it well-formed was in as of 4.3 RC5. if/when the well formed > patch is >> >> introduced (if it isn''t already), it may very well break this >> >> (xendomains) patch. >> > >> > Looks like I was mistaken and that fix was already in 4.2.0 (rc4 to be >> > precise). >> >> Yeah, according to http://jsonlint.com/ the output is valid. I thought it > needed a left-hand object name to be valid, but it seems I was wrong. Anyway, > it''is all good. >> >> Thanks. >> >> p.s. Looks like this patch missed RC6 by 40 minutes. :( > > Actually rc6 effectively happened last night, since the commits made > then needed to pass testing before they could be considered an rc.So does that mean this patch will miss 4.3.0 final?> > Ian. >
Ian Campbell
2013-Jun-27 13:06 UTC
Re: [PATCH] Xendomains was not correctly suspending domains when a STOP was issued.
On Thu, 2013-06-27 at 13:30 +0100, Ian Murray wrote:> > > > ----- Original Message ----- > > From: Ian Campbell <Ian.Campbell@citrix.com> > > To: Ian Murray <murrayie@yahoo.co.uk> > > Cc: "xen-devel@lists.xen.org" <xen-devel@lists.xen.org> > > Sent: Thursday, 27 June 2013, 13:19 > > Subject: Re: [Xen-devel] [PATCH] Xendomains was not correctly suspending > domains when a STOP was issued. > > > > On Thu, 2013-06-27 at 13:15 +0100, Ian Murray wrote: > >> > >> > >> > >> ----- Original Message ----- > >> > From: Ian Campbell <Ian.Campbell@citrix.com> > >> > To: Ian Murray <murrayie@yahoo.co.uk> > >> > Cc: "xen-devel@lists.xen.org" > > <xen-devel@lists.xen.org> > >> > Sent: Thursday, 27 June 2013, 12:59 > >> > Subject: Re: [Xen-devel] [PATCH] Xendomains was not correctly > > suspending > >> domains when a STOP was issued. > >> > > >> > On Thu, 2013-06-27 at 12:51 +0100, Ian Murray wrote: > >> >> Thanks. BTW, the JSON output of 4.3 looked the same to me as > > 4.2.2 > >> >> (i.e. badly formed), so I am not sure the patch you mentioned to > > make > >> >> it well-formed was in as of 4.3 RC5. if/when the well formed > > patch is > >> >> introduced (if it isn''t already), it may very well break this > >> >> (xendomains) patch. > >> > > >> > Looks like I was mistaken and that fix was already in 4.2.0 (rc4 to be > >> > precise). > >> > >> Yeah, according to http://jsonlint.com/ the output is valid. I thought it > > needed a left-hand object name to be valid, but it seems I was wrong. Anyway, > > it''is all good. > >> > >> Thanks. > >> > >> p.s. Looks like this patch missed RC6 by 40 minutes. :( > > > > Actually rc6 effectively happened last night, since the commits made > > then needed to pass testing before they could be considered an rc. > > So does that mean this patch will miss 4.3.0 final?No, it''ll be in the release.> > > > > > Ian. > >