]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8464a0c 0fd6e12)
Merge pull request #1865 from dachary/wip-8254
authorSamuel Just <sam.just@inktank.com>
Wed, 4 Jun 2014 23:01:43 +0000 (16:01 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 4 Jun 2014 23:01:43 +0000 (16:01 -0700)
osd: convert shard_id_t  from uint8_t to struct + merge shard_t into it

Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history
src/osd/osd_types.h patch | diff1 | diff2 | blob | history

diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.