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

Update configuring_aws.adoc #10434

Merged
merged 1 commit into from
Jun 28, 2018
Merged

Conversation

kalexand-rh
Copy link
Contributor

@kalexand-rh kalexand-rh added this to the Next Release milestone Jun 26, 2018
@kalexand-rh kalexand-rh self-assigned this Jun 26, 2018
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 26, 2018
@kalexand-rh kalexand-rh merged commit 5dc49da into openshift:master Jun 28, 2018
@kalexand-rh kalexand-rh deleted the pr8859 branch June 28, 2018 15:04
@kalexand-rh
Copy link
Contributor Author

/cherrypick enterprise-3.10

@kalexand-rh
Copy link
Contributor Author

/cherrypick enterprise-3.9

@kalexand-rh
Copy link
Contributor Author

/cherrypick enterprise-3.7

@openshift-cherrypick-robot

@kalexand-rh: new pull request created: #10500

In response to this:

/cherrypick enterprise-3.10

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

@kalexand-rh: new pull request created: #10501

In response to this:

/cherrypick enterprise-3.9

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.

@kalexand-rh
Copy link
Contributor Author

/cherrypick enterprise-3.6

@openshift-cherrypick-robot

@kalexand-rh: new pull request created: #10502

In response to this:

/cherrypick enterprise-3.7

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

@kalexand-rh: #10434 failed to apply on top of branch "enterprise-3.6":

.git/rebase-apply/patch:21: trailing whitespace.
Set the corresponding value to `owned` if the node belongs exclusively to the 
.git/rebase-apply/patch:40: trailing whitespace.
be labeled with the `kubernetes.io/cluster/<clusterid>,Value=(owned|shared)` 
warning: 2 lines add whitespace errors.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	install_config/configuring_aws.adoc
Falling back to patching base and 3-way merge...
Auto-merging install_config/configuring_aws.adoc
CONFLICT (content): Merge conflict in install_config/configuring_aws.adoc
Patch failed at 0001 Update configuring_aws.adoc

In response to this:

/cherrypick enterprise-3.6

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.

@kalexand-rh
Copy link
Contributor Author

This section isn't in 3.6, so I'm rolling it back to 3.7.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-3.7 branch/enterprise-3.9 branch/enterprise-3.10 size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants