Skip to content

Conversation

mburke5678
Copy link
Contributor

(cherry picked from commit ddb8929)

(cherry picked from commit ddb8929)

Conflicts:
	architecture/core_concepts/pods_and_services.adoc xref:openshift#6972
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 8, 2018
@mburke5678 mburke5678 merged commit 30b5cb8 into openshift:dedicated-3.6-stage Jan 8, 2018
mburke5678 added a commit to mburke5678/openshift-docs that referenced this pull request Jan 10, 2018
…icated-3.6-stage

[dedicated-3.6] add restart policy info xref:openshift#4785
mburke5678 added a commit that referenced this pull request Jan 10, 2018
[dedicated-3.6] Merge pull request #7046 from mburke5678/dedicated-3.6-stage
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants