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

Switch to oc set env/volume, since oc env/volume is now removed #11449

Merged
merged 1 commit into from
Aug 14, 2018

Conversation

soltysh
Copy link

@soltysh soltysh commented Aug 9, 2018

In openshift/origin#20139 I removed oc env and oc volume, this PR updates the ansible not to use them anymore.

This is 3.11 item.

@adellape ptal

@vikram-redhat
Copy link
Contributor

vikram-redhat commented Aug 9, 2018

@bmcelvee - PTAL.

My initial thought was that it didn't require QE, but it would be good to confirm that it is actually in the 3.11 code :)

@bmcelvee
Copy link
Contributor

LGTM ⭐

All associated PRs are merged.

@bmcelvee bmcelvee merged commit 40ffdd2 into openshift:master Aug 14, 2018
@bmcelvee
Copy link
Contributor

/cherrypick enterprise-3.11

@openshift-cherrypick-robot

@bmcelvee: #11449 failed to apply on top of branch "enterprise-3.11":

Using index info to reconstruct a base tree...
M	admin_guide/high_availability.adoc
M	admin_guide/managing_networking.adoc
M	admin_guide/pruning_resources.adoc
M	architecture/networking/routes.adoc
M	cli_reference/basic_cli_operations.adoc
M	cli_reference/cli_by_example_content.adoc
M	dev_guide/dev_tutorials/maven_tutorial.adoc
M	dev_guide/volumes.adoc
M	install_config/registry/deploy_registry_existing_clusters.adoc
M	install_config/registry/extended_registry_configuration.adoc
M	install_config/registry/securing_and_exposing_registry.adoc
M	install_config/router/customized_haproxy_router.adoc
M	install_config/router/default_haproxy_router.adoc
Falling back to patching base and 3-way merge...
Auto-merging install_config/router/default_haproxy_router.adoc
Auto-merging install_config/router/customized_haproxy_router.adoc
Auto-merging install_config/registry/securing_and_exposing_registry.adoc
Auto-merging install_config/registry/extended_registry_configuration.adoc
Auto-merging install_config/registry/deploy_registry_existing_clusters.adoc
Auto-merging dev_guide/volumes.adoc
Auto-merging dev_guide/dev_tutorials/maven_tutorial.adoc
Auto-merging cli_reference/cli_by_example_content.adoc
Auto-merging cli_reference/basic_cli_operations.adoc
Auto-merging architecture/networking/routes.adoc
CONFLICT (content): Merge conflict in architecture/networking/routes.adoc
Auto-merging admin_guide/pruning_resources.adoc
Auto-merging admin_guide/managing_networking.adoc
CONFLICT (content): Merge conflict in admin_guide/managing_networking.adoc
Auto-merging admin_guide/high_availability.adoc
error: Failed to merge in the changes.
Patch failed at 0001 Switch to oc set env/volume, since oc env/volume is now removed

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.

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

Successfully merging this pull request may close these issues.

4 participants