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.

Sign up for GitHub

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

Jump to bottom

test: merging kinvolk/ocicert repo #35

Merged
merged 3 commits into from
Feb 19, 2019
Merged

test: merging kinvolk/ocicert repo #35

merged 3 commits into from
Feb 19, 2019

Conversation

vbatts
Copy link
Member

@vbatts vbatts commented Dec 18, 2018

This did not merge history, but that git-fu magic elludes me.
I accomplished this with the following code:

git remote add ocicert https://github.com/kinvolk/ocicert
git read-tree --prefix=test/ -u ocicert/master

cc @dongsupark

Signed-off-by: Vincent Batts [email protected]

@jzelinskie
Copy link
Member

It's golang, so you have to fix the imports

@vbatts
Copy link
Member Author

vbatts commented Dec 18, 2018

fair. I can add a commit to do that. I had only straight copied them over, with no modifications.
I'll do that Real Quick Like™

@vbatts
Copy link
Member Author

vbatts commented Dec 18, 2018

done

dongsupark
dongsupark reviewed Dec 18, 2018
View reviewed changes
Copy link
Contributor

@dongsupark dongsupark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I was going to do it tomorrow. But anyway thanks for doing that! :-)

PRs that are currently open are not included here though.
Tomorrow I can fix something in those PRs, and create another PR to this distribution-spec repo.

Nit below:

test/Makefile Outdated Show resolved Hide resolved
This was referenced Dec 21, 2018
Closed
Merged
Dongsu Park and others added 2 commits January 2, 2019 13:21
@vbatts
test: merging kinvolk/ocicert repo
dec9ea3 
This did not merge history, but that git-fu magic elludes me.
I accomplished this with the following code:

```shell
git remote add ocicert https://github.com/kinvolk/ocicert
git read-tree --prefix=test/ -u ocicert/master
```

Signed-off-by: Dongsu Park <[email protected]>
Signed-off-by: Vincent Batts <[email protected]>
@vbatts
test: fix import paths
79f0c65 
Signed-off-by: Vincent Batts <[email protected]>
@vbatts
Copy link
Member Author

vbatts commented Jan 2, 2019

fixed the DCO. PTAL

@jzelinskie
Copy link
Member

Copyright headers might need to be changed?

@vbatts
Copy link
Member Author

vbatts commented Jan 2, 2019

fair. Would I do that or allow @dongsupark to? Should it be in the same commit or just in the same change set? 🤔

@caniszczyk
Copy link
Contributor

caniszczyk commented Jan 2, 2019 via email

@dongsupark
Copy link
Contributor

@vbatts Thanks for fixing DCO.
That happened because most kinvolk projects don't require Signed-off-by in commits.
You can simply change copyright headers on your own. Thanks!

@vbatts
*: copyright holder change
e58cbb4 
Change copyright holder from "ocicert authors" to "The Linux
Foundation". This matches the copyright format in the image-spec and
runtime-spec. Dongsu's authorship is preserved and the agreed work of
this effort by LF is recognized in this updated copyright holding.

Signed-off-by: Vincent Batts <[email protected]>
@vbatts
Copy link
Member Author

vbatts commented Jan 3, 2019

updated the copyright holder. PTAL.

@caniszczyk
Copy link
Contributor

RFC @opencontainers/distribution-spec-maintainers for merge

@vbatts
Copy link
Member Author

vbatts commented Jan 16, 2019

yes pls. (i can't LGTM my own PR, even though the bulk of the work is @dongsupark )

@vbatts
Copy link
Member Author

vbatts commented Jan 22, 2019

@opencontainers/distribution-spec-maintainers PTAL

1 similar comment
@vbatts
Copy link
Member Author

vbatts commented Feb 12, 2019

@opencontainers/distribution-spec-maintainers PTAL

@vbatts
Copy link
Member Author

vbatts commented Feb 12, 2019 •
edited by caniszczyk
Loading

LGTM

Approved with PullApprove

@dmcgowan
Copy link
Member

LGTM

@vbatts vbatts merged commit edc719f into opencontainers:master Feb 19, 2019
@vbatts vbatts deleted the combined branch February 19, 2019 20:41
@vbatts vbatts mentioned this pull request Sep 30, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dongsupark dongsupark dongsupark left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@vbatts @jzelinskie @caniszczyk @dongsupark @dmcgowan