]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f5314cf d7014a3)
Merge PR #18694 into master
authorSage Weil <sage@redhat.com>
Sat, 27 Apr 2019 15:41:18 +0000 (10:41 -0500)
committerSage Weil <sage@redhat.com>
Sat, 27 Apr 2019 15:41:18 +0000 (10:41 -0500)
commitcf452946865731c50fc195af681554222af0cefb
treefab2e1c8f9a384b027a611d1cade81c8a1b11f41tree | snapshot
parentf5314cfb330fec3bbe469fd6fe688cd5f695a2e4commit | diff
parentd7014a3d8996146a12053f5f16b82821589f95d5commit | diff
Merge PR #18694 into master

* refs/pull/18694/head:
Merge branch 'master' into sk-add_current_num_in_quota_info
mon/OSDMonitor.cc: Add current numbers of objects and bytes

Reviewed-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.