]> 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: 41897fc 47378d6)
Merge remote-tracking branch 'origin/wip-osd-addr-api'
authorNoah Watkins <noahwatkins@gmail.com>
Thu, 14 Mar 2013 20:27:27 +0000 (13:27 -0700)
committerNoah Watkins <noahwatkins@gmail.com>
Thu, 14 Mar 2013 20:27:56 +0000 (13:27 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>
1  2 
src/libcephfs.cc patch | diff1 | diff2 | blob | history

diff --cc src/libcephfs.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.