The following changes since commit 682df581c65ed2c1b9e77093e332214ecaa1ee93:
Merge remote-tracking branch 'jsnow/tags/ide-pull-request' into staging (2016-11-14 17:07:16 +0000) are available in the git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to a38299bf431a891c0a21a77199e7148c0983413e: docs: fix COLO architecture diagram (2016-11-15 15:36:21 +0800) ---------------------------------------------------------------- Changes from V1: - no change, V1 misses the list Changes from V2: - drop record/replay network support - add a new patch that fixes the COLO proxy parts in the doc ---------------------------------------------------------------- Daniel P. Berrange (1): net: fix sending of data with -net socket, listen backend Yuri Benditovich (1): net: skip virtio-net config of deleted nic's peers Zhang Chen (1): docs: fix COLO architecture diagram docs/COLO-FT.txt | 72 +++++++++++++++++++++++++++-------------------------- hw/net/virtio-net.c | 4 +++ net/net.c | 5 ++-- net/socket.c | 1 + 4 files changed, 44 insertions(+), 38 deletions(-)