#42 pull in the livemedia work deployed in Fedora
Merged 8 years ago by mikem. Opened 9 years ago by ausil.
Unknown source lmc  into  master

No commits found

no initial comment

Pull-Request has been updated

9 years ago

I've checked this against another rebase and found a couple things.

Any reason you never pulled in this commit?
https://github.com/mikem23/koji-playground/commit/1ae35f1de6557fa2cac7b3d5c257b00f28f1d6af
(my rebase contains it)

You rewrote Jon's original commit to change LiveMEDIA to LiveMedia. I've done this in a separate commit instead.

This PR drops handling of 'appliance', 'livecd', 'livemedia' in _do_parseTaskParams. Probably happened during conflict resolution.

Master branch has already assigned faultCode = 1021, LiveMediaError will have to be faultCode = 1022.

This PR adds a duplicate 'createImage' entry to _TASKS in www/kojiweb/index.py

If you're ok with these changes, I'll push my rebase.

I did not intentionally miss any patches. I did start trying to clean the patches up, a lot of them should be squashed.

the fault code is something that happens and can be avoided by doing more prompt code reviews and merges. the duplicate createImage entry should not be there

@ausil, are you okay with @mikem's changes?

@ralph I thought that was what I was saying above. guess it was not clear enough

Good, good. I wasn't sure. The way should be clear then for @mikem to push and resolve this. Thanks!

Commit 6a9be9b fixes this pull-request

Pull-Request has been merged by mikem@redhat.com

8 years ago
Metadata