tree adc3f6aae78c1f1387ebaf0f8ac4f20c99d576ec
parent 5d71bbc5fb076e6d8a37bb3e320d61432b3c2ce0
parent 0bed087df24c7b3fae366f239b9d150de3309416
author Anthony Liguori <aliguori@us.ibm.com> 1371492853 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1371492853 -0500

Merge remote-tracking branch 'kwolf/for-anthony' into staging

# By Liu Yuan (2) and others
# Via Kevin Wolf
* kwolf/for-anthony:
  vmdk: Allow reading variable size descriptor files
  NVMe: Initial commit for new storage interface
  curl: Don't set curl options on the handle just before it's going to be deleted.
  vmdk: byteswap VMDK4Header.desc_offset field
  block/curl.c: Refuse to open the handle for writes.
  sheepdog: support 'qemu-img snapshot -a'
  sheepdog: fix snapshot tag initialization

Message-id: 1371486710-17793-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>