]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #25425 into master
authorSage Weil <sage@redhat.com>
Sat, 8 Dec 2018 17:16:57 +0000 (11:16 -0600)
committerSage Weil <sage@redhat.com>
Sat, 8 Dec 2018 17:16:57 +0000 (11:16 -0600)
* refs/pull/25425/head:
test/common/blkdev-udevadm-info-samples: add a few test cases
ceph-volume: Micron SSDs don't include vendor name in ID_SERIAL
common/blkdev: micron SSDs don't include vendor name in ID_SERIAL
ceph-volume: update get_device_id to match in-tree implementation
common/blkdev: improve device_id generation

Reviewed-by: Jan Fajerski <jfajerski@suse.com>

Trivial merge