]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #19378 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 22 Dec 2017 04:20:07 +0000 (20:20 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 22 Dec 2017 04:20:07 +0000 (20:20 -0800)
* refs/pull/19378/head:
mds,rgw: Initializing standby_reply, sync_tracer

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/rgw/rgw_rados.h

Simple merge