]> 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: fc27b0d f122788)
Merge pull request #4788 from SUSE/wip-11801-firefly
authorNathan Cutler <presnypreklad@gmail.com>
Fri, 4 Sep 2015 14:50:45 +0000 (16:50 +0200)
committerNathan Cutler <presnypreklad@gmail.com>
Fri, 4 Sep 2015 14:50:45 +0000 (16:50 +0200)
Make it more difficult to delete pools in firefly

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/common/config_opts.h patch | diff1 | diff2 | blob | history
src/mon/OSDMonitor.cc patch | diff1 | diff2 | blob | history

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