]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0840cf8 7e4e290)
Merge pull request #14206 from linuxbox2/wip-gui-jewel
authorKen Dreyer <kdreyer@redhat.com>
Fri, 31 Mar 2017 16:07:48 +0000 (10:07 -0600)
committerKen Dreyer <kdreyer@redhat.com>
Fri, 31 Mar 2017 16:07:50 +0000 (10:07 -0600)
jewel: rgw_file: various fixes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/rgw/rgw_file.cc patch | diff1 | diff2 | blob | history
src/rgw/rgw_file.h patch | diff1 | diff2 | blob | history

diff --cc src/rgw/rgw_file.cc
Simple merge
diff --cc src/rgw/rgw_file.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.