From: Sage Weil <sage@inktank.com>
Date: Wed, 29 May 2013 17:26:56 +0000 (-0700)
Subject: Merge remote-tracking branch 'yan/wip-mds'
X-Git-Tag: v0.65~197
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=532dee523ab250dc08cb96578ef8bcc6bba55584;p=ceph.git

Merge remote-tracking branch 'yan/wip-mds'

Reviewed-by: Sage Weil <sage@inktank.com>

Conflicts:
	src/mds/MDCache.cc
---

532dee523ab250dc08cb96578ef8bcc6bba55584