]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>
1  2 
src/mon/OSDMonitor.cc patch | diff1 | diff2 | blob | history

diff --cc src/mon/OSDMonitor.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.