]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit467a95dffb817d4cbf628d4a1b6dc2c1c638cf6e
treeb2a716e12810efcaccf5f6775f15bd0c6035158e
parent42d24395f00281eee6e75361b1dd575ee7311ab2
parent8ce26eaf024e88ddac55de0c4cf15cbec34110c6
Merge branch 'wip-4135'

Feature: #4135 - osd: noscrub, nodeepscrub osdmap flags

Reviewed-by: Samuel Just <sam.just@inktank.com>
src/osd/OSDMap.cc
src/osd/PG.cc