]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #14100 from smithfarm/wip-18781
authorNathan Cutler <presnypreklad@gmail.com>
Thu, 23 Mar 2017 15:49:13 +0000 (16:49 +0100)
committerGitHub <noreply@github.com>
Thu, 23 Mar 2017 15:49:13 +0000 (16:49 +0100)
Manually merge PR#13143 which was mistakenly merged to jewel-next

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

Trivial merge