]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #11425 from weiqiaomiao/wqm-rgw-oplog
authorYehuda Sadeh <yehuda@redhat.com>
Mon, 7 Nov 2016 18:45:10 +0000 (10:45 -0800)
committerGitHub <noreply@github.com>
Mon, 7 Nov 2016 18:45:10 +0000 (10:45 -0800)
rgw: fix the field 'total_time'  of log entry in log show opt

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1  2 
src/rgw/rgw_admin.cc
src/rgw/rgw_log.cc

Simple merge
Simple merge