Skip to content

Update architecture.md#2363

Closed
andrewosh wants to merge 3 commits intocontainerd:masterfrom
andrewosh:patch-1
Closed

Update architecture.md#2363
andrewosh wants to merge 3 commits intocontainerd:masterfrom
andrewosh:patch-1

Conversation

@andrewosh
Copy link
Contributor

No description provided.

@crosbymichael
Copy link
Member

@andrewosh thanks for the PR. You need to sign your commit according to the DCO before we can merge.

https://github.com/containerd/containerd/blob/master/CONTRIBUTING.md#sign-your-work

andrewosh added 2 commits May 29, 2018 12:17
Signed-off-by: Andrew Osheroff <andrewosh@gmail.com>
Signed-off-by: Andrew Osheroff <andrewosh@gmail.com>
@estesp
Copy link
Member

estesp commented Jun 19, 2018

Thanks for your PR! Are you able to sign the commit and re-push? Let us know if you need help.

@andrewosh
Copy link
Contributor Author

andrewosh commented Jun 19, 2018

Ah! Hey @estesp -- ya know, a pesky unsigned merge commit sneaked in, and it's mucking things up. I don't want to waste your time (on a one-word typo fix!) -- feel free to close this and fix the typo yourself :)

If possible, I'd suggest that the commit validator ignore merge commits, as there shouldn't be a need to sign those if the commits-to-merge are signed.

@estesp
Copy link
Member

estesp commented Jun 19, 2018

Yeah, I don't know if that is from using the built-in GitHub tooling, but at the command line doing a git rebase keeps the merge commits from getting thrown in depending on your workflow. This time it may be easier, as you said, for me to just cherry pick your first commit and do a new PR to keep you from having to mess with that :)

@estesp estesp closed this Jun 19, 2018
@andrewosh andrewosh deleted the patch-1 branch June 20, 2018 02:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants