]> 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: 68cbbf4 ad31db9)
Merge branch 'wip-config'
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Mon, 8 Aug 2011 16:55:49 +0000 (09:55 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Mon, 8 Aug 2011 16:55:49 +0000 (09:55 -0700)
1  2 
src/include/ceph/libceph.h patch | diff1 | diff2 | blob | history
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

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