From: Martin Schwidefsky Date: Mon, 9 Oct 2017 09:16:49 +0000 (+0200) Subject: Merge branch 'sthyi' into features X-Git-Tag: ceph-for-4.15-rc4~204^2~46 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3bdf5679c9e46088a0d677e795afc92b5f77940f;p=ceph-client.git Merge branch 'sthyi' into features Add the store-hypervisor-information code into features using a tip branch for parallel merging into the KVM tree. --- 3bdf5679c9e46088a0d677e795afc92b5f77940f