opencompute-developers team mailing list archive
-
opencompute-developers team
-
Mailing list archive
-
Message #00243
Re: [Merge] lp:~nelson-chu/opencompute/add-ocp-cpu-memory-job into lp:opencompute/checkbox
Review: Needs Fixing
Before I can go any further, you have a conflict in data/whitelists/opencompute-certify-local.whitelist
To see this, you should do the following:
bzr branch lp:opencompute/checkbox ocp-checkbox
cd ocp-checkbox
bzr merge lp:~nelson-chu/opencompute/add-ocp-cpu-memory-job
That MAY actually just clean it up... but there's a file conflict in there. so please resolve that and I'll review the rest at that time.
--
https://code.launchpad.net/~nelson-chu/opencompute/add-ocp-cpu-memory-job/+merge/205884
Your team Open Compute Developers is subscribed to branch lp:opencompute/checkbox.
References