From: Sage Weil <sage@redhat.com>
Date: Tue, 12 Jun 2018 13:27:17 +0000 (-0500)
Subject: Merge PR #22423 into master
X-Git-Tag: v14.0.1~1131
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=33d7024c2956743fe1f6dd297a809f13d412587a;p=ceph.git

Merge PR #22423 into master

* refs/pull/22423/head:
	common/blkdev: fix non-linux build for get_device_id
	common/blkdev: do not include vendor in fallback mode
	mgr: allow open-ended life expectancy
	mgr: use prettified durations for life expectancy
	common/ceph_time: very lame timespan_str() helper
	mgr: "predicted failure" -> "life expectancy", and as a range
	mgr: detailed output for 'ceph device ...'
	mgr/DaemonState: skip blank device_ids
	osd: skip blank device ids
	mgr: track and report device names too
	mgr/ActivePyModule: expose 'devices' to python modules
	mgr: move dump/print to DeviceState
	mgr: implement 'device {set,rm}-predicted-failure' commands
	mgr: load persistent device metadata on mgr stat
	include/utime: add parse() method
	mgr: tolerate racing config-key change during load_store()
	mgr: implement 'device {ls,ls-by-daemon,ls-by-host,info}' commands
	mgr/DaemonState: populate DeviceState structures
	mgr: parse out devids from daemon metadata
	common/blkdev: add modelines
	osd: include device_ids in metadata
	common/blkdev: add get_device_id() helper.

Reviewed-by: Erwan Velu <erwan@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
---

33d7024c2956743fe1f6dd297a809f13d412587a
diff --cc .githubmap
index c86817241831,dc4ece06047f..3f3feaa6f439
--- a/.githubmap
+++ b/.githubmap
@@@ -58,4 -58,4 +58,5 @@@ chardan Jesse Williamson <jwilliamson@s
  jdurgin Josh Durgin <jdurgin@redhat.com>
  jan--f Jan Fajerski <jfajerski@suse.com>
  idryomov Ilya Dryomov <idryomov@redhat.com>
 +varadakari Varada Kari <varadaraja.kari@flipkart.com>
+ ErwanAliasr1 Erwan Velu <erwan@redhat.com>