On 23 June 2014 17:36, Luiz Capitulino <lcapitul...@redhat.com> wrote: > The following changes since commit d9c1647d896d3192cba9dbf98fb7efab876edde5: > > Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' > into staging (2014-06-23 12:55:22 +0100) > > are available in the git repository at: > > > git://repo.or.cz/qemu/qmp-unstable.git queue/qmp > > for you to fetch changes up to d622cb5879ca8006d5482158e4e3b272a068c301: > > monitor: protect event emission (2014-06-23 11:12:28 -0400) > > ---------------------------------------------------------------- > > I've included a fix from Igor that fixes the most serious conflict from my > last pull request. Besides, I've fixed some trivial to medium conflicts myself > and included my two build fixes. Build tested and tested most events again.
Applied, thanks. -- PMM
