]> 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: a44854c 0c83b5f)
Merge remote-tracking branch 'gh/wip-corpus' into next
authorSage Weil <sage@inktank.com>
Fri, 12 Jul 2013 20:06:35 +0000 (13:06 -0700)
committerSage Weil <sage@inktank.com>
Fri, 12 Jul 2013 20:06:35 +0000 (13:06 -0700)
Rgw bits Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>

1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history
src/osd/OSDMap.cc patch | diff1 | diff2 | blob | history

diff --cc src/Makefile.am
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.