Skip to content

Regenerate ffjson for Timeout field - #351

Merged
vbatts merged 1 commit into
opencontainers:masterfrom
crosbymichael:regen-json
Mar 29, 2016
Merged

Regenerate ffjson for Timeout field#351
vbatts merged 1 commit into
opencontainers:masterfrom
crosbymichael:regen-json

Conversation

@crosbymichael

Copy link
Copy Markdown
Member

Just from the ordering of the commits this was missed in the PR when it was merged.

Signed-off-by: Michael Crosby crosbymichael@gmail.com

@crosbymichael

Copy link
Copy Markdown
MemberAuthor

Why travis so mad?

@wking

Copy link
Copy Markdown
Contributor

On Fri, Mar 18, 2016 at 05:02:07PM -0700, Michael Crosby wrote:

Why travis so mad?

#350 (see 1).

@vbatts

Copy link
Copy Markdown
Member

#350

On Fri, Mar 18, 2016, 21:15 Michael Crosby notifications@github.com wrote:

Why travis so mad?


You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub
#351 (comment)

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
@crosbymichael

Copy link
Copy Markdown
MemberAuthor

I rebased this and its good to go now

@mrunalp

Copy link
Copy Markdown
Contributor

LGTM

1 similar comment
@vbatts

Copy link
Copy Markdown
Member

LGTM

@vbatts
vbatts merged commit cf8ebc9 into opencontainers:masterMar 29, 2016
@crosbymichael
crosbymichael deleted the regen-json branch March 29, 2016 17:25
wking added a commit to wking/opencontainer-runtime-spec that referenced this pull request Apr 12, 2016
Through 6734c7a (Merge pull request opencontainers#370 from
vbatts/json_schema_and_examples, 2016-04-11).
The only unlisted changes to master were a brief run with ffjson
(opencontainers#343, opencontainers#351), but that was pulled out due to gccgo issues in opencontainers#363.
Signed-off-by: W. Trevor King <wking@tremily.us>
wking added a commit to wking/opencontainer-runtime-spec that referenced this pull request Apr 12, 2016
Through 6734c7a (Merge pull request opencontainers#370 from
vbatts/json_schema_and_examples, 2016-04-11).
The only unlisted changes to master were a brief run with ffjson
(opencontainers#343, opencontainers#351), but that was pulled out due to gccgo issues in opencontainers#363.
Signed-off-by: W. Trevor King <wking@tremily.us>
vbatts pushed a commit to vbatts/oci-runtime-spec that referenced this pull request Apr 12, 2016
Through 6734c7a (Merge pull request opencontainers#370 from
vbatts/json_schema_and_examples, 2016-04-11).
The only unlisted changes to master were a brief run with ffjson
(opencontainers#343, opencontainers#351), but that was pulled out due to gccgo issues in opencontainers#363.
Signed-off-by: W. Trevor King <wking@tremily.us>
Mashimiao pushed a commit to Mashimiao/specs that referenced this pull request Aug 19, 2016
Through 6734c7a (Merge pull request opencontainers#370 from
vbatts/json_schema_and_examples, 2016-04-11).
The only unlisted changes to master were a brief run with ffjson
(opencontainers#343, opencontainers#351), but that was pulled out due to gccgo issues in opencontainers#363.
Signed-off-by: W. Trevor King <wking@tremily.us>
Sign up for freeto 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.

4 participants

@crosbymichael@wking@vbatts@mrunalp