Skip to content

Merge master into master-next #1188

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

Merged
merged 35 commits into from
Feb 15, 2019
Merged

Merge master into master-next #1188

merged 35 commits into from
Feb 15, 2019

Conversation

joshuawilson
Copy link
Contributor

Update the master-next branch to the latest master.

dtaylor113 and others added 30 commits February 4, 2019 11:20
Add detail and list pages for machine configs and machine config pools
…nges

Change "Current Version" label to "Desired Version," which is more
accurate. Add an "Update History" table so that it's possible to see the
last completed update version.

https://bugzilla.redhat.com/show_bug.cgi?id=1666231
Bug 1666231 - Update Cluster Settings page for ClusterVersion API changes
Logs: Fixed 'horizontally scrolling resumes paused streaming'
Fix operator hub integration test due to removal of Dynatrace OneAgent
copy ci test output files to artifacts dir on script exit
Fix bug where nav doesn't collapse when resizing to mobile
Error Handling for Creating Operator Custom Resources with Invalid Templates
Fix Cluster Settings > Cluster Operators sort by status
Fix runtime error when ClusterOperator has no `status` stanza
Remove "Machines" tab from MachineConfigPool details page until the API and desired behavior are worked out
Bug 1671605 - Hide Machines nav section from normal users
Update machine API group and version
Remove "Create Machine Config" button from Machine Configs tab on MachineConfigPool detail page
Handle logout for the special kube:admin user
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Feb 14, 2019
Copy link
Contributor

@alecmerdler alecmerdler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 14, 2019
@joshuawilson
Copy link
Contributor Author

/retest

@openshift-merge-robot openshift-merge-robot merged commit 41171ca into master-next Feb 15, 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.