Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest changes from upstream #6

Merged
merged 6 commits into from Jul 16, 2019
Merged

Conversation

elfosardo
Copy link

No description provided.

iurygregory and others added 6 commits July 10, 2019 20:15
Prometheus has a default port for the ironic-prometheus-exporter[1]

[1] https://github.com/prometheus/prometheus/wiki/Default-port-allocations
Change ironic-prometheus-exporter port
Limit mDNS to the provisioning interface
Switching to gunicorn, since uwsgi is not available in the OSP packages.
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 16, 2019
@iurygregory
Copy link

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 16, 2019
@derekhiggins
Copy link

/lgtm

@elfosardo elfosardo merged commit a9c1805 into openshift:master Jul 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants