]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32187 into master
authorSage Weil <sage@redhat.com>
Thu, 12 Dec 2019 22:07:16 +0000 (16:07 -0600)
committerSage Weil <sage@redhat.com>
Thu, 12 Dec 2019 22:07:16 +0000 (16:07 -0600)
* refs/pull/32187/head:
ceph.in: (py3) use binary stdout
pybind/mgr: index=4, sort_keys=True for json.dumps throughput

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>

Trivial merge