TL/DR; - We had pull requests incorrectly generated against next that
were merged, in order to avoid messing up with things I merged master
into next. No action is required by anyone copied on this message, this
is just to make people aware of the mistakes.
Hello folks:
Yu just brought to my attention that we had some pull requests generated
against master that were merged, breaking the expectations that patches
go to next first, then to master, so they can stand some regression testing.
The offending pull requests merged are:
commit f5e1403d0043b0c3838ff053ba14e8524c41d400
Merge: 6b01cda f0189cc
Author: Lucas Meneghel Rodrigues <[email protected]>
Date: Tue Nov 12 13:35:00 2013 -0800
Merge pull request #1056 from Guannan-Ren/master
virttest.virsh: Add virsh migrate setspeed/getspeed functions
commit 6b01cdaad8e406144d2b5e99a9386d4fc2976e69
Merge: 19ed856 4cac41e
Author: Yiqiao Pu <[email protected]>
Date: Tue Nov 12 03:20:28 2013 -0800
Merge pull request #1057 from FengYang/ipi_x2apic
qemu.test.ipi_x2apic: Typo fix str - check_string.
commit 19ed8562dee7e8fc7da9eda89560f6eb9edbd787
Merge: 3feece7 99759ff
Author: Rudá Moura <[email protected]>
Date: Fri Nov 8 10:19:11 2013 -0800
Merge pull request #1048 from ehabkost/cpuid-fixes
CPUID config file updates
I recently started using the nice little merge buttons on github, but
the fact we easily miss the detail of which branch a pull request was
generated against strikes me as a disadvantage.
After thinking a lot on how to solve this potential conflict, I looked
at the PRs and saw that they are low risk, so they shouldn't break
virt-test core functionality. Therefore, I merged master in next, so
that there are no non-ff updates to any branch, and things can continue
to go smoothly.
There are some things about our release management process that need to
be re thought, and we had a fair deal of discussion about it during KVM
Forum. I will structure an RFC and post it to the ML, so you guys can
give me some feedback on it.
Cheers,
Lucas
_______________________________________________
Virt-test-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/virt-test-devel
