From: Sage Weil <sage@inktank.com>
Date: Wed, 13 Mar 2013 23:38:38 +0000 (-0700)
Subject: Merge branch 'wip-mds-con'
X-Git-Tag: v0.60~80
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F105%2Fhead;p=ceph.git

Merge branch 'wip-mds-con'

Reviewed-by: Greg Farnum <greg@inktank.com>
Tested-by: Noah Watkins <jayhawk@cs.ucsc.edu>
---

8b713371447f9761597457af2c81f0b870d3c4ba