From: Sage Weil <sage@inktank.com>
Date: Sun, 2 Feb 2014 17:15:27 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/wip-inline'
X-Git-Tag: v0.78~234
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29eac1d14e2484e69888602329bdd9db060ec3c3;p=ceph.git

Merge remote-tracking branch 'gh/wip-inline'

Passed fs suite, sage-2014-02-01_22:18:10-fs-wip-inline-testing-basic-plana,
modulo a snap test error in the suite.

Reviewed-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

29eac1d14e2484e69888602329bdd9db060ec3c3