]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1500 from ceph/wip-tid_t
authorSage Weil <sage@inktank.com>
Thu, 20 Mar 2014 23:07:29 +0000 (16:07 -0700)
committerSage Weil <sage@inktank.com>
Thu, 20 Mar 2014 23:07:29 +0000 (16:07 -0700)
Change tid_t to ceph_tid_t to avoid conflicts with a popular type

Reviewed-by: Sage Weil <sage@inktank.com>
1  2 
src/osd/OSD.cc
src/osd/ReplicatedPG.cc
src/osdc/Objecter.cc
src/osdc/Objecter.h

diff --cc src/osd/OSD.cc
Simple merge
Simple merge
Simple merge
Simple merge