]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3676 from majianpeng/misc
authorSamuel Just <sam.just@inktank.com>
Thu, 12 Feb 2015 01:26:05 +0000 (17:26 -0800)
committerSamuel Just <sam.just@inktank.com>
Thu, 12 Feb 2015 01:26:05 +0000 (17:26 -0800)
Misc

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Trivial merge