]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-mds-con' 105/head
authorSage Weil <sage@inktank.com>
Wed, 13 Mar 2013 23:38:38 +0000 (16:38 -0700)
committerSage Weil <sage@inktank.com>
Wed, 13 Mar 2013 23:38:38 +0000 (16:38 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>
Tested-by: Noah Watkins <jayhawk@cs.ucsc.edu>

Trivial merge