]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commitbcc254fe502a28a080a84b237a8a06edc58f0bb7
treed9b881802a573740ff58847ff57d6752c429026a
parentc9b4e7d9be3d34edffef142b82fc9d9d031c21f9
parent1268dbb36e11c55f7160f416d8579676eb53d74f
Merge pull request #1500 from ceph/wip-tid_t

Change tid_t to ceph_tid_t to avoid conflicts with a popular type

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