Am 03.04.2018 um 23:03 hat Jeff Cody geschrieben: > On Tue, Apr 03, 2018 at 06:33:52PM +0200, Kevin Wolf wrote: > > The legacy command line interface gets the socket path from an option > > called 'socket'. QAPI in contract uses SocketAddress, where the > > corresponding option is called 'path'. > > > > Fix the gluster block driver to accept both 'socket' and 'path', with > > 'path' being the preferred syntax. > > > > https://bugzilla.redhat.com/show_bug.cgi?id=1545155 > > > > Cc: qemu-sta...@nongnu.org > > Signed-off-by: Kevin Wolf <kw...@redhat.com> > > Reviewed-by: Eric Blake <ebl...@redhat.com> > > Oops, you and I had a pull request collision on this patch (it is in both of > our PRs); Sorry, my fault, I didn't know you were pulling it in through your > tree.
Or my fault for applying a patch to something that is maintained by you. Anyway, I think git should sort it out without a problem. Kevin
