From: Sage Weil <sage@inktank.com>
Date: Fri, 8 Mar 2013 01:52:26 +0000 (-0800)
Subject: Merge branch 'wip-traceless'
X-Git-Tag: v0.60~121
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=de62a79589fc4feed4243ac278d365b6363bfa2b;p=ceph.git

Merge branch 'wip-traceless'

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

de62a79589fc4feed4243ac278d365b6363bfa2b