From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Jul 2018 18:42:58 +0000 (-0500)
Subject: Merge PR #22870 into master
X-Git-Tag: v14.0.1~929
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc4381691af1d4b45bcb4af814b70cc774d392c5;p=ceph-ci.git

Merge PR #22870 into master

* refs/pull/22870/head:
	mgr: replace iteritems with six.iteritems (mgr_module.py)
	mgr: replace iteritems with six.iteritems (crash)
	mgr: replace iteritems with six.iteritems (telegraf)
	mgr: replace iteritems with six.iteritems (status)
	mgr: replace iteritems with six.iteritems (restful)
	mgr: replace iteritems with six.iteritems (influx)
	mgr: replace iteritems with six.iteritems (balancer)

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Wido den Hollander <wido@42on.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

bc4381691af1d4b45bcb4af814b70cc774d392c5