Merge remote-tracking branch 'bonzini/nbd-next' into staging
commit7d8f4b34a4bb6996d958da211f1dfb2686c7d82b
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 18 Jun 2013 15:06:39 +0000 (18 10:06 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 18 Jun 2013 15:06:39 +0000 (18 10:06 -0500)
tree73af8d72adc7382be7d9119237ac3568772ce97f
parent5b456438f5bb395ed6b1eec95e18ce7a7a884a0a
parent23307908790cd8fad91220863d7712c571ddc977
Merge remote-tracking branch 'bonzini/nbd-next' into staging

# 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