]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #22870 into master
authorSage Weil <sage@redhat.com>
Fri, 6 Jul 2018 18:42:58 +0000 (13:42 -0500)
committerSage Weil <sage@redhat.com>
Fri, 6 Jul 2018 18:42:58 +0000 (13:42 -0500)
* 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>

Trivial merge