From: David Zafman <david.zafman@inktank.com>
Date: Mon, 11 Mar 2013 19:50:38 +0000 (-0700)
Subject: Merge branch 'wip-4135'
X-Git-Tag: v0.60~105
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=467a95dffb817d4cbf628d4a1b6dc2c1c638cf6e;p=ceph.git

Merge branch 'wip-4135'

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

Reviewed-by: Samuel Just <sam.just@inktank.com>
---

467a95dffb817d4cbf628d4a1b6dc2c1c638cf6e