]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #22588 into master
authorSage Weil <sage@redhat.com>
Sat, 23 Jun 2018 22:05:35 +0000 (17:05 -0500)
committerSage Weil <sage@redhat.com>
Sat, 23 Jun 2018 22:05:35 +0000 (17:05 -0500)
* 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>
1  2 
.githubmap
src/pybind/mgr/mgr_module.py

diff --cc .githubmap
index 63104c954437f35fe4e31160c6d75035c0f38af6,58a6a747b2d85a73a323e4e1e41313a6afe5ab8a..d3666d6cc16acaaf8558847e40158b4fb6c43c57
@@@ -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>
Simple merge