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 master into master-next #1240

Merged

Conversation

spadgett
Copy link
Member

We need #1226 from master to fix CI in master-next.

/assign @rhamilto

sg00dwin and others added 24 commits February 18, 2019 09:59
Remove unused operator-active image file
Fix runtime error when pod has no volumes
Add back OAuth configuration link in kubeadmin notifier
…zation

Normalize display of <ResourceIcon> across browsers, platforms
Add margin spacing so event info doesn't run together before truncating
sessionStorage has limited space. Only store what we're using for the
YAML editor.
- Disable flakey overview sidebar test
- Disable flakey Node.js source-to-image test
- Change performance test to use project list as initial page

We can reenable the two disabled tests when we address the flakes.

Related issues:

https://jira.coreos.com/browse/CONSOLE-1293
https://jira.coreos.com/browse/CONSOLE-1297
https://jira.coreos.com/browse/CONSOLE-1298
Improve console-e2e test reliability in CI
Edit secret page returns to previous page when cancelling
…t-issue

Adjust modal height at landscape orientation so that buttons aren't beneath viewport on ios.
…board-layout

Updated Resource Quota dashboard layout
Add missing OpenShift Dedicated option to getProductName
Fix bug where cluster name is incorrect in kubeconfig created from se…
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 28, 2019
@benjaminapetersen
Copy link
Contributor

/lgtm

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

@rhamilto rhamilto 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-merge-robot openshift-merge-robot merged commit 927c612 into openshift:master-next Feb 28, 2019
@spadgett spadgett deleted the rebase-master-next branch February 28, 2019 18:56
@spadgett spadgett restored the rebase-master-next branch March 7, 2019 23:49
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants