Hi all, db-stable r10647 has been merged into devel at r13163. devel is now in release-critical mode, until we QA past r13163 (probably in 8-10 hours)
Unfortunately, a conflicting revision landed on devel a few hours ago, so we had little choice but to resolve conflicts during the merge. This means that there are one or two conflicts ahead, which I will not be awake to resolve. buildbot-poller will attempt to merge r13162 into db-devel in about 4 hours, which will conflict the same way. It's fairly simple to resolve, or you can just take the files from r13163. If this is not resolved identically to the way I resolved it in r13163, the two resolutions will conflict *again* in about 8 hours. That one should be trivial. If people could take care of these while I sleep, it would be great. QA-wise, the importd side of r13158 (the bzr* upgrade) needs testing on staging once it's there (qastaging has no importds, so it must be staging). Aside from that we should be fine to release r13163 on Wednesday. William
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-dev Post to : launchpad-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-dev More help : https://help.launchpad.net/ListHelp
