]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitbc4381691af1d4b45bcb4af814b70cc774d392c5
tree64be0897941b45ea07ada7393b3fac41e2468b4d
parent15732cdfc1a8d94544ebfb7c2561eb5829ccb895
parentdc87c3c5808eb73266b0cfa21c37cf32b7bb8e4d
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>