templates: Move more files into common/#783
Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom May 21, 2019
Merged
templates: Move more files into common/#783openshift-merge-robot merged 1 commit intoopenshift:masterfrom
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
Conversation
openshift-ci-robot
added
approved
Follow up to openshift#627 which only moved the pull secret to avoid conflicting with other PRs, but since that went well let's do the rest of the `_base/files` dir. Via this script: ``` set -euo pipefail master=templates/master/00-master worker=templates/worker/00-worker (cd ${master} && find _base/files -type f) | while read f; do if [ -f "${worker}/${f}" ] && cmp -s ${master}/${f} ${worker}/${f}; then git mv ${master}/$f templates/common/_base/files git rm ${worker}/$f fi done ```
cgwalters
force-pushed
the
more-template-common
branch
from
c74f11a to
faa5a9c
Compare
Contributor
|
/lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters, kikisdeliveryservice The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Member
|
/appove |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow up to #627
which only moved the pull secret to avoid conflicting with other PRs,
but since that went well let's do the rest of the
_base/filesdir.Via this script: