]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #307 from xiaoxichen/master
authorSage Weil <sage@inktank.com>
Thu, 23 May 2013 15:45:55 +0000 (08:45 -0700)
committerSage Weil <sage@inktank.com>
Thu, 23 May 2013 15:45:55 +0000 (08:45 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge