Merge v1.0.0.rc1 into master #181

wking · 2016-08-03T17:37:48Z

This pulls in #161, along with a bunch of other cherry-picked
backports. New to this branch (not in either v1.0.0.rc1 or master:

$ git log --first-parent origin/master..HEAD
commit 1ea737dc1daefb374aefcaa85c3ebff3d4e60f48
Merge: eac0762 207e26c
Author: W. Trevor King <[email protected]>
Date:   Wed Aug 3 10:31:26 2016 -0700

    Merge branch 'v1.0.0.rc1'

    * v1.0.0.rc1:
      update urfave/cli package to v1.18.0
      generate: optimize namespace setup log and fix manpage
      change param type of AddProcessAdditionalGid
      remove unnecessary return error value
      Modify generate API
      Add Travis CI badge to README
      generate: fix capability.List() for cap_last_cap not exist
      generate: remove unnecessary spec initialization
      generate: fix tmpfs adding based on manpage
      Check CAP_LAST_CAP while setting privileged
      generate: Remove superfluous err check from Save

commit eac076272d2316f8257d0ed1f869bfd22500d192
Merge: b45bebd 30e2ea2
Author: W. Trevor King <[email protected]>
Date:   Tue Aug 2 21:58:24 2016 -0700

    Merge commit '30e2ea2'

    With:

      $ git merge -s ours --log 30e2ea2

    because we don't want to remove the Linux pointer field adjustments
    from the backported commit.

    * commit '30e2ea2':
      Check pointer fields of g.spec

commit b45bebd09be6eeb30223b471b71f4f16d5b2a74d
Merge: 9d3881d 6acca9e
Author: W. Trevor King <[email protected]>
Date:   Tue Aug 2 21:54:21 2016 -0700

    Merge commit '6acca9e'

    With:

      $ git merge -s ours --log 6acca9e

    because we don't want to roll back the master branch's runtime-spec.

    * commit '6acca9e':
      Godeps: Roll runtime-spec back to v1.0.0-rc1

After this series, future v1.0.0.rc1 work should be mergeable into
master without any ‘-s ours’ hoop jumping.

Makefile: clean up compiled man page

…ve-unuseful-default-value generate: remove unuseful default value for output

Use Generator pointers as methods receivers

…validate move defaultCaps to validate

The commit reference that landed in 2d0dbcf (Update runtime-spec dependency to v1.0.0-rc1, 2016-06-14, opencontainers#110) was a few commits after the tag, but the v1.0.0.rc1 branch is aiming for compatibility with the tagged release (e.g. no -dev suffix on the generated version). Signed-off-by: W. Trevor King <[email protected]>

Godeps: Roll runtime-spec back to v1.0.0-rc1

Signed-off-by: W. Trevor King <[email protected]>

Signed-off-by: Haiyan Meng <[email protected]> Backported to v1.0.0-rc1 and removed the references to a Linux pointer field. Signed-off-by: W. Trevor King <[email protected]>

Signed-off-by: Haiyan Meng <[email protected]> Backported to v1.0.0-rc1 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0-rc1 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Check pointer fields of g.spec

…dding generate: fix tmpfs adding based on manpage

Check CAP_LAST_CAP while setting privileged

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0.rc1 from 1371b52 opencontainers#168 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Signed-off-by: masm <[email protected]> Backported to v1.0.0.rc1 from f7df9c7 opencontainers#157 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

https://travis-ci.org/opencontainers/ocitools Signed-off-by: Chris Aniszczyk <[email protected]> Backported to v1.0.0.rc1 from d0ad8ca opencontainers#170 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

…t_cap generate: fix capability.List() for cap_last_cap not exist

…cessary-init-spec generate: remove unnecessary spec initialization

Add Travis CI badge to README

generate: Remove superfluous err check from Save

With: $ git merge -s ours --log 6acca9e because we don't want to roll back the master branch's runtime-spec. * commit '6acca9e': Godeps: Roll runtime-spec back to v1.0.0-rc1

With: $ git merge -s ours --log 30e2ea2 because we don't want to remove the Linux pointer field adjustments from the backported commit. * commit '30e2ea2': Check pointer fields of g.spec

Signed-off-by: Haiyan Meng <[email protected]> Backported to v1.0.0.rc1 from a217d8c opencontainers#169 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Signed-off-by: Haiyan Meng <[email protected]> Backported to v1.0.0.rc1 from b31cc61 opencontainers#169 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Signed-off-by: Haiyan Meng <[email protected]> Backported to v1.0.0.rc1 from a99f698 opencontainers#169 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0.rc1 from 15f529b opencontainers#166 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

The new version of urfave/cli supports Int64Flag and Uint64Flag. These flag types are useful for setting cpu/mem resources. Signed-off-by: Haiyan Meng <[email protected]> Backported to v1.0.0.rc1 from dc3404e opencontainers#174 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

[1.0.0.rc1] update urfave/cli package to v1.18.0

[1.0.0.rc1] Modify generate API

…ptimize-fix-manpage [1.0.0.rc1] generate: optimize namespace setup log and fix manpage

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0.rc1 from 2c278ff opencontainers#167 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

…r-generate [1.0.0.rc1] completions: update based on generate help message

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0.rc1 from c4fb2c0 opencontainers#156 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

…group-bug [1.0.0.rc1] generate: fix mount-cgroups bug

Signed-off-by: Haiyan Meng <[email protected]> Backported to v1.0.0.rc1 from 1915407 opencontainers#176 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

wking · 2016-08-05T17:43:49Z

On Wed, Aug 03, 2016 at 10:54:27AM -0700, W. Trevor King wrote:

commit 1ea737dc1daefb374aefcaa85c3ebff3d4e60f48
Merge: eac0762 207e26c
Author: W. Trevor King <[email protected]>
Date:   Wed Aug 3 10:31:26 2016 -0700

    Merge branch 'v1.0.0.rc1'

    * v1.0.0.rc1:
      update urfave/cli package to v1.18.0
      …
After this series, future v1.0.0.rc1 work should be mergeable into
master without any ‘-s ours’ hoop jumping.

I can update the tip commit here to pull in the current v1.0.0.rc1 tip
(which has advanced due to backported changes since I initially pushed
this PR). But all of those backported changes are already in master,
so there should be no functional change, but the more backported
changes we merge into master, the smaller the next merge from
v1.0.0.rc1 into master will be. Anyhow, let me know if you would like
me to update this PR or not, I'm fine either way.

[1.0.0.rc1] support setting oom_score_adj

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0.rc1 from 5de50e5 opencontainers#189 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0.rc1 from 9cad4d8 opencontainers#195 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

…validation [1.0.0.rc1] validation: add linux resource check

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0.rc1 from bf50b73 opencontainers#199 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

…for-mappings [1.0.0.rc1] add namespace check for uid/gid mappings

Before this commit the latter was slightly more popular: $ git grep '\*\*(1)' | wc -l 3 $ git grep '(1)\*\*' | wc -l 2 Change generated with: $ sed -i 's/(1)\*\*/**(1)/g' $(git grep -l '(1)\*\*') Signed-off-by: W. Trevor King <[email protected]>

…x-help [1.0.0.rc1] add label manpage and fix help

man/ocitools.1: Replace "**...(1)**" with "**...**(1)"

* v1.0.0.rc1: man/ocitools.1: Replace "**...(1)**" with "**...**(1)" add namespace check for uid/gid mappings validation: add linux resource check add label manpage and fix help support setting oom_score_adj generate: fix mount-cgroups bug completions: update based on generate help message update urfave/cli package to v1.18.0 generate: optimize namespace setup log and fix manpage change param type of AddProcessAdditionalGid remove unnecessary return error value Modify generate API Add Travis CI badge to README generate: fix capability.List() for cap_last_cap not exist generate: remove unnecessary spec initialization generate: fix tmpfs adding based on manpage Check CAP_LAST_CAP while setting privileged generate: Remove superfluous err check from Save Signed-off-by: W. Trevor King <[email protected]> Conflicts: cmd/ocitools/generate.go man/ocitools-generate.1.md The conflicts are because: * support setting oom_score_adj (opencontainers#176, opencontainers#185) * add label manpage and fix help (opencontainers#189, opencontainers#190) have landed in master and been backported to v1.0.0.rc1 since this branch split from master. They wouldn't have happend if I'd rebased this branch on the current master before merging v1.0.0.rc1, but then I'd have to repeat the initial dance done with eac0762 (Merge commit '30e2ea2', 2016-08-02) and b45bebd (Merge commit '6acca9e', 2016-08-02).

wking · 2016-09-01T23:11:25Z

I've updated the tip commit here with 1ea737d → 4fcbcb4 to pull in the newly-merged-into v1.0.0.rc1 #202. So now this branch is bringing both #202 and #161 into master (and making it easy to pull in future v1.0.0.rc1-based changes).

caniszczyk · 2016-11-08T16:39:13Z

should this be closed now?

wking · 2016-11-08T17:47:04Z

On Tue, Nov 08, 2016 at 08:39:13AM -0800, Chris Aniszczyk wrote:

should this be closed now?

The changes from #161 and #202 still need to be pulled into master.
If merging v1.0.0.rc1 into master is not the way maintainers want that
to happen (for example, they should close this PR with a comment to
that effect. Maybe they'd rather me cherry-pick them into master
(like #258 did with #251)? I still think this approach is easier long
term, but I'm not a maintainer ;).

Mashimiao · 2016-11-09T01:49:53Z

Rejected. Reasons as in #258

Mashimiao · 2016-11-24T07:05:30Z

closed based on the result of previous discussions

Mrunal Patel and others added 30 commits July 26, 2016 11:10

Merge pull request opencontainers#148 from wking/makefile-clean-man-page

d07fade

Makefile: clean up compiled man page

Merge pull request opencontainers#149 from wking/generate-output-remo…

ee4d82c

…ve-unuseful-default-value generate: remove unuseful default value for output

Merge pull request opencontainers#150 from wking/pointer-receivers

0d42f0c

Use Generator pointers as methods receivers

Merge pull request opencontainers#151 from wking/move-default-cap-to-…

71fd99c

…validate move defaultCaps to validate

Merge pull request opencontainers#153 from wking/v1.0.0.rc1-godep

6acca9e

Godeps: Roll runtime-spec back to v1.0.0-rc1

generate: Remove superfluous err check from Save

4aa0071

Signed-off-by: W. Trevor King <[email protected]>

Check pointer fields of g.spec

bbe46e2

Signed-off-by: Haiyan Meng <[email protected]> Backported to v1.0.0-rc1 and removed the references to a Linux pointer field. Signed-off-by: W. Trevor King <[email protected]>

Check CAP_LAST_CAP while setting privileged

5295830

Signed-off-by: Haiyan Meng <[email protected]> Backported to v1.0.0-rc1 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

generate: fix tmpfs adding based on manpage

3968a06

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0-rc1 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Merge pull request opencontainers#163 from wking/check-pointer-fields

30e2ea2

Check pointer fields of g.spec

Merge pull request opencontainers#165 from wking/generate-fix-tmpfs-a…

5067a2e

…dding generate: fix tmpfs adding based on manpage

Merge pull request opencontainers#164 from wking/privileged-cap-list

28ddd80

Check CAP_LAST_CAP while setting privileged

generate: remove unnecessary spec initialization

928bf89

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0.rc1 from 1371b52 opencontainers#168 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

generate: fix capability.List() for cap_last_cap not exist

e5bcb77

Signed-off-by: masm <[email protected]> Backported to v1.0.0.rc1 from f7df9c7 opencontainers#157 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Add Travis CI badge to README

11f1b12

https://travis-ci.org/opencontainers/ocitools Signed-off-by: Chris Aniszczyk <[email protected]> Backported to v1.0.0.rc1 from d0ad8ca opencontainers#170 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Merge pull request opencontainers#171 from wking/generate-fix-cap_las…

3a58f65

…t_cap generate: fix capability.List() for cap_last_cap not exist

Merge pull request opencontainers#172 from wking/generate-remove-unne…

8f9f38f

…cessary-init-spec generate: remove unnecessary spec initialization

Merge pull request opencontainers#173 from wking/add-travis-ci-badge

c186f4f

Add Travis CI badge to README

Merge pull request opencontainers#161 from wking/superfluous-err-check

f72c7f5

generate: Remove superfluous err check from Save

Merge commit '6acca9e'

b45bebd

With: $ git merge -s ours --log 6acca9e because we don't want to roll back the master branch's runtime-spec. * commit '6acca9e': Godeps: Roll runtime-spec back to v1.0.0-rc1

Merge commit '30e2ea2'

eac0762

With: $ git merge -s ours --log 30e2ea2 because we don't want to remove the Linux pointer field adjustments from the backported commit. * commit '30e2ea2': Check pointer fields of g.spec

Modify generate API

f43eacf

Signed-off-by: Haiyan Meng <[email protected]> Backported to v1.0.0.rc1 from a217d8c opencontainers#169 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

remove unnecessary return error value

fe62695

Signed-off-by: Haiyan Meng <[email protected]> Backported to v1.0.0.rc1 from b31cc61 opencontainers#169 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

change param type of AddProcessAdditionalGid

36ccd5c

Signed-off-by: Haiyan Meng <[email protected]> Backported to v1.0.0.rc1 from a99f698 opencontainers#169 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

generate: optimize namespace setup log and fix manpage

ed659ab

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0.rc1 from 15f529b opencontainers#166 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Merge pull request opencontainers#179 from wking/urfave-cli-v1.18.0

21ce013

[1.0.0.rc1] update urfave/cli package to v1.18.0

Merge pull request opencontainers#177 from wking/generate-api-cleanup

217ce82

[1.0.0.rc1] Modify generate API

Merge pull request opencontainers#178 from wking/generate-namespace-o…

207e26c

…ptimize-fix-manpage [1.0.0.rc1] generate: optimize namespace setup log and fix manpage

Ma Shimiao and others added 5 commits August 3, 2016 16:12

completions: update based on generate help message

119586e

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0.rc1 from 2c278ff opencontainers#167 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Merge pull request opencontainers#182 from wking/completion-update-fo…

2a8f316

…r-generate [1.0.0.rc1] completions: update based on generate help message

generate: fix mount-cgroups bug

56a65bd

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0.rc1 from c4fb2c0 opencontainers#156 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Merge pull request opencontainers#183 from wking/generate-fix-mount-c…

52c9e15

…group-bug [1.0.0.rc1] generate: fix mount-cgroups bug

support setting oom_score_adj

de97cc8

Signed-off-by: Haiyan Meng <[email protected]> Backported to v1.0.0.rc1 from 1915407 opencontainers#176 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Mrunal Patel and others added 10 commits August 5, 2016 13:00

Merge pull request opencontainers#185 from wking/set-oom_score_adj

ea1d5dd

[1.0.0.rc1] support setting oom_score_adj

add label manpage and fix help

a336a00

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0.rc1 from 5de50e5 opencontainers#189 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

validation: add linux resource check

f4bba5a

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0.rc1 from 9cad4d8 opencontainers#195 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Merge pull request opencontainers#198 from wking/add-linux-resources-…

8eab016

…validation [1.0.0.rc1] validation: add linux resource check

add namespace check for uid/gid mappings

d020606

Signed-off-by: Ma Shimiao <[email protected]> Backported to v1.0.0.rc1 from bf50b73 opencontainers#199 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <[email protected]>

Merge pull request opencontainers#201 from wking/add-namespace-check-…

3309d87

…for-mappings [1.0.0.rc1] add namespace check for uid/gid mappings

Merge pull request opencontainers#190 from wking/man-add-label-and-fi…

3091c7e

…x-help [1.0.0.rc1] add label manpage and fix help

Merge pull request opencontainers#202 from wking/no-bold-man-section

975c97f

man/ocitools.1: Replace "**...(1)**" with "**...**(1)"

wking force-pushed the v1.0.0.rc1-for-master branch from 1ea737d to 4fcbcb4 Compare September 1, 2016 23:06

wking mentioned this pull request Sep 20, 2016

bump runtime-spec #217

Closed

wking mentioned this pull request Sep 28, 2016

[1.0.0.rc1] man: add tty option and tfix #162

Closed

This was referenced Oct 25, 2016

[Master] generate/generate: Fix "specifed" -> "specified" typo #258

Merged

cmd/runtimetest: Add an app description #260

Closed

Mashimiao closed this Nov 24, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge v1.0.0.rc1 into master #181

Merge v1.0.0.rc1 into master #181

Uh oh!

wking commented Aug 3, 2016

Uh oh!

wking commented Aug 5, 2016

Uh oh!

wking commented Sep 1, 2016 via email

Uh oh!

caniszczyk commented Nov 8, 2016

Uh oh!

wking commented Nov 8, 2016

Uh oh!

Mashimiao commented Nov 9, 2016 •

edited by caniszczyk

Loading

Uh oh!

Mashimiao commented Nov 24, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Merge v1.0.0.rc1 into master #181

Merge v1.0.0.rc1 into master #181

Uh oh!

Conversation

wking commented Aug 3, 2016

Uh oh!

wking commented Aug 5, 2016

Uh oh!

wking commented Sep 1, 2016 via email

Uh oh!

caniszczyk commented Nov 8, 2016

Uh oh!

wking commented Nov 8, 2016

Uh oh!

Mashimiao commented Nov 9, 2016 • edited by caniszczyk Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mashimiao commented Nov 24, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Mashimiao commented Nov 9, 2016 •

edited by caniszczyk

Loading