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

.mailmap: Consolidate James' entries #924

Merged
merged 1 commit into from
Sep 27, 2017
Merged

Conversation

wking
Copy link
Contributor

@wking wking commented Sep 25, 2017

Preferring his new (more detailed) name:

$ git log --decorate --author james.o.hunt | grep -B1 Author
commit e27acdd9ca0a6218ec77cca99eceb785696d9405 (origin/pr/922)
Author: James O. D. Hunt <james.o.hunt@intel.com>
--
commit 30bc03316827834bafb03409fab49576b3beb530 (origin/pr/539)
Author: James Hunt <james.o.hunt@intel.com>

CC @jodh-intel.

Preferring his new (more detailed) name:

  $ git log --decorate --author james.o.hunt | grep -B1 Author
  commit e27acdd (origin/pr/922)
  Author: James O. D. Hunt <james.o.hunt@intel.com>
  --
  commit 30bc033 (origin/pr/539)
  Author: James Hunt <james.o.hunt@intel.com>

Signed-off-by: W. Trevor King <wking@tremily.us>
@dqminh
Copy link
Contributor

dqminh commented Sep 26, 2017

LGTM

Approved with PullApprove

1 similar comment
@hqhq
Copy link
Contributor

hqhq commented Sep 27, 2017

LGTM

Approved with PullApprove

@hqhq hqhq merged commit a812559 into opencontainers:master Sep 27, 2017
@wking wking deleted the mailmap branch October 4, 2017 22:23
wking added a commit to wking/opencontainer-runtime-spec that referenced this pull request Oct 4, 2017
Through 3417098 (Merge pull request opencontainers#913 from rutsky/fix-link,
2017-10-04).

There have also been a few non-spec changes which I have not
documented in the ChangeLog:

13b4639 .pullapprove.yml: Switch to v2 and other project-template
  updates (opencontainers#902)
f6f2514 README: Make meetings monthly (were weekly) (opencontainers#910)
e27acdd implementations: Replace "cc-oci-runtime" with "cc-runtime"
  (opencontainers#922)
8a16f08 .mailmap: Consolidate James' entries (opencontainers#924)

Signed-off-by: W. Trevor King <wking@tremily.us>
wking added a commit to wking/opencontainer-runtime-spec that referenced this pull request Oct 24, 2017
Through a5276ae (Merge pull request opencontainers#929 from
giuseppe/add-more-implementations, 2017-10-23).

There have also been a few non-spec changes which I have not
documented in the ChangeLog:

13b4639 .pullapprove.yml: Switch to v2 and other project-template
  updates (opencontainers#902)
f6f2514 README: Make meetings monthly (were weekly) (opencontainers#910)
e27acdd implementations: Replace "cc-oci-runtime" with "cc-runtime"
  (opencontainers#922)
ec4cc47 implementations: add crun (opencontainers#929)
d4990d1 implementations: add bwrap-oci (opencontainers#929)
8a16f08 .mailmap: Consolidate James' entries (opencontainers#924)

Signed-off-by: W. Trevor King <wking@tremily.us>
vbatts pushed a commit to vbatts/oci-runtime-spec that referenced this pull request Oct 30, 2017
Through a5276ae (Merge pull request opencontainers#929 from
giuseppe/add-more-implementations, 2017-10-23).

There have also been a few non-spec changes which I have not
documented in the ChangeLog:

13b4639 .pullapprove.yml: Switch to v2 and other project-template
  updates (opencontainers#902)
f6f2514 README: Make meetings monthly (were weekly) (opencontainers#910)
e27acdd implementations: Replace "cc-oci-runtime" with "cc-runtime"
  (opencontainers#922)
ec4cc47 implementations: add crun (opencontainers#929)
d4990d1 implementations: add bwrap-oci (opencontainers#929)
8a16f08 .mailmap: Consolidate James' entries (opencontainers#924)

Signed-off-by: W. Trevor King <wking@tremily.us>
@vbatts vbatts mentioned this pull request Oct 30, 2017
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