]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #12607 from liewegas/wip-librados-killack
authorSage Weil <sage@redhat.com>
Mon, 9 Jan 2017 22:17:43 +0000 (16:17 -0600)
committerGitHub <noreply@github.com>
Mon, 9 Jan 2017 22:17:43 +0000 (16:17 -0600)
librados,osdc: kill ack vs commit distinction

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
1  2 
src/client/Client.cc
src/client/Client.h
src/client/SyntheticClient.cc
src/librados/IoCtxImpl.cc
src/librados/IoCtxImpl.h
src/librados/RadosClient.cc
src/mds/CInode.cc
src/mds/MDCache.cc
src/mds/StrayManager.cc
src/osd/PrimaryLogPG.cc

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