Merge "RHSM: do not use retry to deploy katello-agent" into stable/pike
authorZuul <zuul@review.openstack.org>
Thu, 2 Nov 2017 18:34:55 +0000 (18:34 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 2 Nov 2017 18:34:55 +0000 (18:34 +0000)

Trivial merge