]> 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: 42d2439 8ce26ea)
Merge branch 'wip-4135'
authorDavid Zafman <david.zafman@inktank.com>
Mon, 11 Mar 2013 19:50:38 +0000 (12:50 -0700)
committerDavid Zafman <david.zafman@inktank.com>
Mon, 11 Mar 2013 19:51:25 +0000 (12:51 -0700)
Feature: #4135 - osd: noscrub, nodeepscrub osdmap flags

Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/osd/OSDMap.cc patch | diff1 | diff2 | blob | history
src/osd/PG.cc patch | diff1 | diff2 | blob | history

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