]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-5381' into wip-mds
authorSage Weil <sage@inktank.com>
Fri, 28 Jun 2013 21:24:08 +0000 (14:24 -0700)
committerSage Weil <sage@inktank.com>
Fri, 28 Jun 2013 21:24:08 +0000 (14:24 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge