← Back to team overview

opencompute-developers team mailing list archive

Thread
Date

Re: [Merge] lp:~bladernr/opencompute/add-disk-stress into lp:opencompute/checkbox

To: Jeff Lane <jeffrey.lane@xxxxxxxxxxxxx>
From: Jeff Marcom <jeff.marcom@xxxxxxxxxxxxx>
Date: Fri, 27 Sep 2013 17:12:13 -0000
In-reply-to: <20130927134524.10146.83858.launchpad@ackee.canonical.com>
Reply-to: mp+188052@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Attempt to merge into lp:opencompute/checkbox failed due to conflicts: 

text conflict in data/whitelists/opencompute-ready-local.whitelist
-- 
https://code.launchpad.net/~bladernr/opencompute/add-disk-stress/+merge/188052
Your team Open Compute Developers is subscribed to branch lp:opencompute/checkbox.

References

[Merge] lp:~bladernr/opencompute/add-disk-stress into lp:opencompute/checkbox
From: Jeff Lane, 2013-09-27