]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #195 from ceph/wip-9729_master
authorSandonV <sandon@inktank.com>
Thu, 16 Oct 2014 21:27:40 +0000 (14:27 -0700)
committerSandonV <sandon@inktank.com>
Thu, 16 Oct 2014 21:27:40 +0000 (14:27 -0700)
Wip 9729 master


Trivial merge