Merge remote-tracking branch 'remotes/fam/tags/for-upstream' into staging
authorStefan Hajnoczi <stefanha@redhat.com>
Mon, 14 Nov 2016 15:35:57 +0000 (15:35 +0000)
committerStefan Hajnoczi <stefanha@redhat.com>
Mon, 14 Nov 2016 15:35:57 +0000 (15:35 +0000)
commit736986fad31cd0f25cec89138a566f6938935a29
treee13553881eefe25bbdbd8706105133456c9fe42c
parent83c83f9a5266ff113060f887f106a47920fa6974
parentd9c05e507f7a6647cd7b106c8784f1f15a0e4f5c
Merge remote-tracking branch 'remotes/fam/tags/for-upstream' into staging

* remotes/fam/tags/for-upstream:
  test-uuid: fix leak

Message-id: 20161111131818.GC12800@lemon
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>