[Development] CI is back to normal

[Thiago Macieira]

On terça-feira, 7 de maio de 2013 12.07.25, Sergio Ahumada wrote:
> On 05/07/2013 06:01 AM, Thiago Macieira wrote:
> > On terça-feira, 7 de maio de 2013 03.49.50, Fält Simo wrote:
> >> Now when Thiago's DNS zone fix is in, feel free to start staging your
> >> changes again. The qtbase#dev is still going to fail as long as it is
> >> missing this Thiago's fix.
> > 
> > Someone needs to do the merge of stable into dev and push. I'll review the
> > change when it comes in.
> 
> merge from stable into dev here:
> 
> https://codereview.qt-project.org/55549

And it's merged, so dev should be normal again.

I'll back port the qhostinfo parts of the patch to 4.8. Though I have seen 4.8 
integrate since the problem appeared, so either the tests aren't being run or 
qhostinfo is being ignored.

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.qt-project.org/pipermail/development/attachments/20130507/afbd64de/attachment.sig>