]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit9d222b943217a2ec022678e50b34766d231004ce
tree72486f3fcad4b3eb43af429a86a3d9c0bee0d3fd
parentce2e9897c08775cfbe318f637d61e07eb5433df5
parentcb9fae56ebdfda28b0606ee89631deb60e5f7de7
Merge pull request #14100 from smithfarm/wip-18781

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>