From: Sage Weil <sage@redhat.com>
Date: Fri, 1 Aug 2014 22:37:33 +0000 (-0700)
Subject: Merge branch 'wip-cache-second'
X-Git-Tag: v0.85~114
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79d1aff1821bc9f21477636df4d0d4e57f2cd008;p=ceph.git

Merge branch 'wip-cache-second'

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

79d1aff1821bc9f21477636df4d0d4e57f2cd008