]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/master' into wip-4354-mds-optracker
authorGreg Farnum <greg@inktank.com>
Tue, 13 May 2014 17:54:12 +0000 (10:54 -0700)
committerGreg Farnum <greg@inktank.com>
Tue, 13 May 2014 17:54:12 +0000 (10:54 -0700)
commit04c280e7c1e8384979f5c82c09dd432d2b70d197
tree51f7af1723287216553bd6c8b63e7964ab96508a
parentca313c20bec871ee4958bc7af23b9a46924513ce
parent20814de9e917b0ea4ade91e74750ee1285281b41
Merge remote-tracking branch 'origin/master' into wip-4354-mds-optracker

Conflicts:
src/mds/Locker.cc
src/osd/OpRequest.cc
src/osd/OpRequest.h

Signed-off-by: Greg Farnum <greg@inktank.com>
15 files changed:
src/common/config_opts.h
src/mds/CDentry.h
src/mds/Locker.cc
src/mds/MDCache.cc
src/mds/MDCache.h
src/mds/MDS.cc
src/mds/MDS.h
src/mds/Makefile.am
src/mds/Mutation.cc
src/mds/Mutation.h
src/mds/Server.cc
src/mds/snap.h
src/osd/OSD.cc
src/osd/OpRequest.cc
src/osd/OpRequest.h