Merge PR #22920 into jewel
authorSage Weil <sage@redhat.com>
Mon, 9 Jul 2018 14:50:16 +0000 (09:50 -0500)
committerSage Weil <sage@redhat.com>
Mon, 9 Jul 2018 14:50:16 +0000 (09:50 -0500)
commit6188abd34ddd7bc895156ea50d6772bea5595332
tree4a715e964fdf4001fb0c23149e7149151d939129
parenteba5d7168c82601029348287323bb3b575d79e84
parent3a0b203d7183bd29298d371d51a2a827848c5ee1
Merge PR #22920 into jewel

* refs/pull/22920/head:
Revert "Merge pull request #17893 from dzafman/wip-19140-19224"

Reviewed-by: David Zafman <dzafman@redhat.com>