From: Sage Weil <sage@redhat.com>
Date: Sat, 23 Jun 2018 22:05:35 +0000 (-0500)
Subject: Merge PR #22588 into master
X-Git-Tag: v14.0.1~1033
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2f7595131b3f63379b2f5c9da903ebee762edc66;p=ceph-ci.git

Merge PR #22588 into master

* refs/pull/22588/head:
	mgr/iostat: column_width should be int not float

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Mohamad Gebai <mgebai@suse.com>
---

2f7595131b3f63379b2f5c9da903ebee762edc66
diff --cc .githubmap
index 63104c95443,58a6a747b2d..d3666d6cc16
--- a/.githubmap
+++ b/.githubmap
@@@ -60,6 -60,4 +60,7 @@@ 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>
 +alfredodeza Alfredo Deza <adeza@redhat.com>
 +dmick Dan Mick <dmick@redhat.com>
 +aclamk Adam Kupczyk <akucpzyk@redhat.com>
+ mogeb Mohamad Gebai <mgebai@suse.com>