Skip to content

Conversation

@rh-max
Copy link
Contributor

@rh-max rh-max commented Feb 7, 2019

No description provided.

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 7, 2019
@vikram-redhat
Copy link
Contributor

@rh-max - does this apply to 4.0 as well? Do you need to add it there? Is this waiting on an approval before it can go in to 3.11?

@rh-max
Copy link
Contributor Author

rh-max commented Feb 12, 2019

@vikram-redhat

  • Yep, it applies to 4.0 too, and for the current OKD as well.
  • So yes, I need to add them. I plan to cherry-pick this to master and to make the same change for 4.0.
  • No, I already have the approval for this change for 3.11 and OKD. It is to be merged now.

If you can, please merge it. I don't know when I will be assigned merge permissions.
Thanks for looking into this.

@vikram-redhat
Copy link
Contributor

@rh-max ok cool. It is not referenced from anywhere else atm, so I guess you will do a followup and add to master, 3.11 and 4.0 branches. Merging.

@openshift-cherrypick-robot

@vikram-redhat: once the present PR merges, I will cherry-pick it on top of enterprise-3.11 in a new PR and assign it to you.

Details

In response to this:

/cherrypick enterprise-3.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@vikram-redhat
Copy link
Contributor

/cherrypick enterprise-4.0

@openshift-cherrypick-robot

@vikram-redhat: once the present PR merges, I will cherry-pick it on top of enterprise-4.0 in a new PR and assign it to you.

Details

In response to this:

/cherrypick enterprise-4.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@vikram-redhat
Copy link
Contributor

/cherrypick master

@openshift-cherrypick-robot

@vikram-redhat: once the present PR merges, I will cherry-pick it on top of master in a new PR and assign it to you.

Details

In response to this:

/cherrypick master

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@vikram-redhat vikram-redhat merged commit 6aa33bb into openshift:enterprise-3.11 Feb 13, 2019
@openshift-cherrypick-robot

@vikram-redhat: #13568 failed to apply on top of branch "enterprise-4.0":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	install_config/images/monitoring-diagram.png
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): install_config/images/monitoring-diagram.png deleted in HEAD and modified in Update the monitoring diagram. Version Update the monitoring diagram of install_config/images/monitoring-diagram.png left in tree.
Patch failed at 0001 Update the monitoring diagram

Details

In response to this:

/cherrypick enterprise-4.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@vikram-redhat: new pull request created: #13611

Details

In response to this:

/cherrypick master

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@vikram-redhat
Copy link
Contributor

@rh-max added in master and merged into 3.11. Might need a separate one for 4.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-3.11 branch/enterprise-4.1 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.

4 participants