]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 28981f4 31b9ff0)
Merge remote-tracking branch 'origin/master' into wip-getuid
authorGreg Farnum <gfarnum@redhat.com>
Sat, 24 Sep 2016 01:12:33 +0000 (18:12 -0700)
committerGreg Farnum <gfarnum@redhat.com>
Sat, 24 Sep 2016 01:12:33 +0000 (18:12 -0700)
commit7d2a8b71528760c0a3c357d09c9eeea682b43e11
treee1d02a9228810ad6e84929ad0fe28dd9cccf0f8ftree | snapshot
parent28981f4cae91918a58078190a7267b7324cb6729commit | diff
parent31b9ff0f699987a4fb062366c2acdd3a68a43097commit | diff
Merge remote-tracking branch 'origin/master' into wip-getuid

Conflicts:
src/client/Client.cc
src/client/Client.h
src/client/Makefile.am
src/client/fuse_ll.cc

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
src/client/Client.cc diff1 | diff2 | blob | history
src/client/Client.h diff1 | diff2 | blob | history
src/client/Inode.cc diff1 | diff2 | blob | history
src/client/Inode.h diff1 | diff2 | blob | history
src/client/MetaRequest.h diff1 | diff2 | blob | history
src/common/config_opts.h diff1 | diff2 | blob | history
src/libcephfs.cc diff1 | diff2 | blob | history
src/mds/Locker.cc diff1 | diff2 | blob | history
src/mds/Server.cc diff1 | diff2 | blob | history
src/mds/SessionMap.cc diff1 | diff2 | blob | history
src/messages/MClientRequest.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.