]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b45643 2330790)
Merge remote-tracking branch 'bonzini/nbd-next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 18 Jun 2013 15:06:39 +0000 (10:06 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 18 Jun 2013 15:06:39 +0000 (10:06 -0500)
# By Ján Tomko
# Via Paolo Bonzini
* bonzini/nbd-next:
  nbd: strip braces from literal IPv6 address in URI
  qemu-socket: allow hostnames starting with a digit


Trivial merge
Qemu copy for testing