]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-3186
authorSage Weil <sage@inktank.com>
Thu, 27 Sep 2012 00:06:03 +0000 (17:06 -0700)
committerSage Weil <sage@inktank.com>
Thu, 27 Sep 2012 00:06:03 +0000 (17:06 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>
1  2 
src/mds/Server.cc

Simple merge