Skip to content

Correctly merge env edits after background upates #2407

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Nov 1, 2017
Merged

Correctly merge env edits after background upates #2407

merged 1 commit into from
Nov 1, 2017

Conversation

spadgett
Copy link
Member

Fixes #2394

/kind bug

@openshift-ci-robot openshift-ci-robot added kind/bug Categorizes issue or PR as related to a bug. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 31, 2017
@spadgett
Copy link
Member Author

/assign @jwforres

@jwforres
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2017
@spadgett
Copy link
Member Author

WebDriver flake #1684

/retest

@spadgett spadgett force-pushed the edit-env-background-update branch from 4fa90c7 to 7e266f0 Compare October 31, 2017 19:35
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 31, 2017
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2017
@spadgett
Copy link
Member Author

Rebased and rebuilt dist

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 31, 2017
@spadgett spadgett force-pushed the edit-env-background-update branch from 7e266f0 to c4e3c93 Compare October 31, 2017 20:04
@spadgett
Copy link
Member Author

Rebased and rebuilt

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 31, 2017
@spadgett
Copy link
Member Author

Adding lgtm label since last changes were a rebase only

@spadgett spadgett added the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2017
@spadgett spadgett force-pushed the edit-env-background-update branch from c4e3c93 to acfc8be Compare November 1, 2017 00:19
@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 1, 2017
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 1, 2017
@spadgett
Copy link
Member Author

spadgett commented Nov 1, 2017

Rebased and rebuilt dist

@spadgett spadgett added the lgtm Indicates that a PR is ready to be merged. label Nov 1, 2017
@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit 57ae92d into openshift:master Nov 1, 2017
@spadgett spadgett deleted the edit-env-background-update branch November 1, 2017 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jwforres jwforres jwforres approved these changes

Assignees

@jwforres jwforres

Labels
kind/bug Categorizes issue or PR as related to a bug. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@spadgett @jwforres @openshift-merge-robot @openshift-ci-robot