From: Sage Weil <sage@inktank.com>
Date: Sat, 7 Jul 2012 03:01:33 +0000 (-0700)
Subject: Merge branch 'wip-cond'
X-Git-Tag: v0.50~107
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dddf783fa43b8b1343dc1bc8e5ebdd9ea5bbe3cb;p=ceph.git

Merge branch 'wip-cond'

Reviewed-by: Greg Farnum <greg@inktank.com>
---

dddf783fa43b8b1343dc1bc8e5ebdd9ea5bbe3cb