]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #874 from ceph/jewel-15008
authorGregory Farnum <greg@gregs42.com>
Thu, 24 Mar 2016 00:09:02 +0000 (17:09 -0700)
committerGregory Farnum <greg@gregs42.com>
Thu, 24 Mar 2016 00:09:02 +0000 (17:09 -0700)
Jewel 15008

Reviewed-by: John Spray <john.spray@redhat.com>

Trivial merge