← Back to team overview

opencompute-developers team mailing list archive

Thread
Date

Re: [Merge] lp:~jeffmarcom/opencompute/update-memory-tests into lp:opencompute/checkbox

To: Jeff Marcom <jeff.marcom@xxxxxxxxxxxxx>
From: Jeff Marcom <jeff.marcom@xxxxxxxxxxxxx>
Date: Tue, 24 Sep 2013 19:21:19 -0000
In-reply-to: <20130924001425.13579.61599.launchpad@ackee.canonical.com>
Reply-to: mp+187124@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in data/whitelists/opencompute-ready-local.whitelist
text conflict in debian/changelog
-- 
https://code.launchpad.net/~jeffmarcom/opencompute/update-memory-tests/+merge/187124
Your team Open Compute Developers is subscribed to branch lp:opencompute/checkbox.

References

[Merge] lp:~jeffmarcom/opencompute/update-memory-tests into lp:opencompute/checkbox
From: Jeff Marcom, 2013-09-24