]> 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: 4f31756 94c3f29)
Merge pull request #500 from ceph/wip-5910
authorGregory Farnum <greg@inktank.com>
Wed, 14 Aug 2013 22:34:05 +0000 (15:34 -0700)
committerGregory Farnum <greg@inktank.com>
Wed, 14 Aug 2013 22:34:05 +0000 (15:34 -0700)
Resolves #5910.

Reviewed-by: Greg Farnum <greg@inktank.com>
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history
src/mon/OSDMonitor.cc patch | diff1 | diff2 | blob | history

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