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

config: Drop redundant "unique within this map" annotation requirement #862

Merged
merged 1 commit into from
Jun 1, 2017

Conversation

wking
Copy link
Contributor

@wking wking commented May 26, 2017

This condition landed in #510 with subsequent wording tweaks in #645 and #654. However, since #584 we forbid duplicate keys on all objects (not just annotations), so this PR removes the redundant annotation-specific condition.

@wking
Copy link
Contributor Author

wking commented May 31, 2017

This polishing is not changing the spec requirements (just making the spec more efficient about declaring those requirements), so it's not a problem if it lands post-1.0. Can a maintainer tag it v1.NEXT-maybe if it's too much trouble to review now?

@wking wking force-pushed the redundant-unique-key branch from aa115ac to eba7304 Compare June 1, 2017 15:33
This condition landed in 27a05de (Add text about extensions,
2016-06-26, opencontainers#510) with subsequent wording tweaks in 3f0440b
(config.md: add empty limit for key of annotations, Dec 28 10:35:19
2016, opencontainers#645) and 2c8feeb (config: Bring "unique... within this map"
back together, 2017-01-12, opencontainers#654).  However, since eeaccfa (glossary:
Make objects explicitly unordered and forbid duplicate names,
2016-09-27, opencontainers#584) we forbid duplicate keys on *all* objects (not just
annotations), so this PR removes the redundant annotation-specific
condition.

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

wking commented Jun 1, 2017

Rebased around #846 with aa115aceba7304.

@mrunalp
Copy link
Contributor

mrunalp commented Jun 1, 2017

LGTM

Approved with PullApprove

1 similar comment
@crosbymichael
Copy link
Member

crosbymichael commented Jun 1, 2017

LGTM

Approved with PullApprove

@crosbymichael crosbymichael merged commit 10b5414 into opencontainers:master Jun 1, 2017
@wking wking deleted the redundant-unique-key branch June 2, 2017 04:18
@vbatts vbatts mentioned this pull request Jul 5, 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