From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH OSSTEST v2 0/5] Tweaks to allow running non-master production instances Date: Wed, 15 Apr 2015 12:58:35 +0100 Message-ID: <1429099115.15516.236.camel@citrix.com> References: <1429092280.15516.169.camel@citrix.com> <21806.19581.41077.291529@mariner.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <21806.19581.41077.291529@mariner.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Jackson Cc: xen-devel List-Id: xen-devel@lists.xenproject.org On Wed, 2015-04-15 at 12:33 +0100, Ian Jackson wrote: > Ian Campbell writes ("[PATCH OSSTEST v2 0/5] Tweaks to allow running non-master production instances"): > > WRT applying this I think normally we should apply such changes to the > > upstream production instance and let them filter through, but in this > > case I think it would be better to push my ad-hoc tested branch (based > > on upstream "cambridge: Set HostProp_DhcpWatchMethod back to woking", > > reference by pull req below) to the local Cambridge pretest, allow it to > > automerge upstream master into that and test the result. Once that > > passes I will send a pull-request to merge the result back into the > > mainline. > > I think you are probably right, since this particular series contains > the merging-from-an-upsream machinery. Since you have now acked everything may I push to the Cambridge branch (once the VM is working again)? (modulo if you want me to make the minor change discussed on 1/5 now or not) Ian.