Skip to content

Conversation

@mrunalp
Copy link
Contributor

@mrunalp mrunalp commented Sep 14, 2016

@liangchenye @wking @Mashimiao PTAL

Signed-off-by: Mrunal Patel [email protected]

@philips
Copy link
Contributor

philips commented Sep 14, 2016

LGTM

test_runtime.sh Outdated
oci-runtime-tool generate --output "${TESTDIR}/config.json" "${TEST_ARGS[@]}" --rootfs '.'

TESTCMD="${RUNTIME} start $(uuidgen)"
TESTCMD="${RUNTIME} run $(uuidgen)"
Copy link
Contributor

Choose a reason for hiding this comment

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

Drive-by change? More discussion on this change in #184, but I'd rather not do this as part of this PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@wking It was unintentional. Reverted. Thanks!

@wking
Copy link
Contributor

wking commented Sep 14, 2016 via email

@mrunalp
Copy link
Contributor Author

mrunalp commented Sep 14, 2016

@wking @philips Thanks! I'll merge this in and we can fixup things up later if we find anything amiss.

@mrunalp mrunalp merged commit a4ce1e5 into opencontainers:master Sep 14, 2016
@wking
Copy link
Contributor

wking commented Sep 14, 2016

On Wed, Sep 14, 2016 at 12:25:21PM -0700, Mrunal Patel wrote:

I'll merge this in and we can fixup things up later if we find anything amiss.

Ah, we forgot to bump MAINTAINERS and nominate @liangchenye to put him
back in [1,2].

wking pushed a commit to wking/ocitools-v2 that referenced this pull request Sep 15, 2016
Signed-off-by: Mrunal Patel <[email protected]>

Backported to v1.0.0.rc1 from a774b91 opencontainers#212.  The only conflict was in
man/oci-runtime-tool.1.md, where master's opencontainers#212 renamed "ocitools" ->
"oci-runtime-tool" and v1.0.0.rc1's opencontainers#202 had shifted "**...(1)**" ->
"**...**(1)".

Signed-off-by: W. Trevor King <[email protected]>
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