[Qemu-commits] [qemu/qemu] 891a2b: Fix ipv6 options according to documentation

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 891a2bb58c5c4cbedc82e9606b049bf4c298b88b
      
https://github.com/qemu/qemu/commit/891a2bb58c5c4cbedc82e9606b049bf4c298b88b
  Author: Samuel Thibault <address@hidden>
  Date:   2016-03-31 (Thu, 31 Mar 2016)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  Fix ipv6 options according to documentation

The options names were fixed in the qapi layer, but not in the command-line
options.

Signed-off-by: Samuel Thibault <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 92741fc4b6cbf7a8f6cce45e9a468d5637a4ff6a
      
https://github.com/qemu/qemu/commit/92741fc4b6cbf7a8f6cce45e9a468d5637a4ff6a
  Author: Peter Maydell <address@hidden>
  Date:   2016-03-31 (Thu, 31 Mar 2016)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into 
staging

slirp updates

# gpg: Signature made Thu 31 Mar 2016 00:08:38 BST using RSA key ID FB6B2F1D
# gpg: Good signature from "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
#      Subkey fingerprint: F632 74CD C630 0873 CB3D  29D9 E3E5 1CE8 FB6B 2F1D

* remotes/thibault/tags/samuel-thibault:
  Fix ipv6 options according to documentation

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/a1a668efd561...92741fc4b6cb