← Back to team overview

wordpress-charmers team mailing list archive

Thread
Date

Re: [Merge] ~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress:admin-password-action into charm-k8s-wordpress:master

To: Tom Haddon <tom.haddon@xxxxxxxxxxxxx>
From: Canonical IS Mergebot <canonical-is-mergebot@xxxxxxxxxxxxx>
Date: Tue, 12 Jan 2021 09:04:43 -0000
In-reply-to: <161037650242.4265.12145551497877994836.launchpad@ackee.canonical.com>
Reply-to: mp+395982@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Failed to merge change (unable to merge source repository due to conflicts), setting status to needs review.
-- 
https://code.launchpad.net/~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress/+merge/395982
Your team Wordpress Charmers is requested to review the proposed merge of ~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress:admin-password-action into charm-k8s-wordpress:master.

References

[Merge] ~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress:admin-password-action into charm-k8s-wordpress:master
From: Tom Haddon, 2021-01-11