]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7098 from liewegas/wip-file-layout
authorGregory Farnum <greg@gregs42.com>
Thu, 3 Mar 2016 03:15:18 +0000 (19:15 -0800)
committerGregory Farnum <greg@gregs42.com>
Thu, 3 Mar 2016 03:15:18 +0000 (19:15 -0800)
mds, client: add namespace to file_layout_t (previously ceph_file_layout)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/common/config_opts.h
src/include/encoding.h
src/librbd/ImageCtx.cc
src/librbd/ImageCtx.h
src/librbd/internal.cc
src/osd/OSDMap.h
src/test/encoding/types.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge