]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #14205 from linuxbox2/wip-dir-orphan-jewel
authorKen Dreyer <kdreyer@redhat.com>
Fri, 31 Mar 2017 16:07:03 +0000 (10:07 -0600)
committerKen Dreyer <kdreyer@redhat.com>
Fri, 31 Mar 2017 16:07:03 +0000 (10:07 -0600)
jewel:  rgw_file: wip dir orphan

 Conflicts:
src/rgw/rgw_file.cc (whitespace, trivial resolution)

Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/rgw/rgw_file.cc
src/rgw/rgw_file.h

Simple merge
Simple merge