We failed on a repo merge conflict.

I had CENGN's stx-tool on a side branch as a work around to enable builds while I was waiting for one of my commits to merge.

The update did merge, but that of course had a conflict with the identical change of the side branch. I have now discarded the side branch, and done a test repo sync. I'll launch a CENGN build shortly, and we'll then have a valid build and context.

Scott

On 2020-02-24 7:00 p.m., build.starlingx@gmail.com wrote:

Project: STX_build_master_master
Build #: 450
Status: Failure
Timestamp: 20200225T000001Z

Check logs at:
http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/20200225T000001Z/logs
--------------------------------------------------------------------------------
Parameters

BUILD_CONTAINERS_DEV: false
BUILD_CONTAINERS_STABLE: false
FORCE_BUILD: true

_______________________________________________
Starlingx-discuss mailing list
Starlingx-discuss@lists.starlingx.io
http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss