Skip to content

Conversation

@wking
Copy link
Contributor

@wking wking commented May 27, 2016

The shorter-than-normal (for the rest of this list) indent landed with
the line in be59415 (Split create and start, 2016-04-01, #384).

@hqhq
Copy link
Contributor

hqhq commented May 28, 2016

LGTM

Approved with PullApprove

@mrunalp
Copy link
Contributor

mrunalp commented May 31, 2016

Needs rebase.

@wking wking force-pushed the lifecycle-indent branch from ad803e5 to 7b28a16 Compare May 31, 2016 17:25
The shorter-than-normal (for the rest of this list) indent landed with
the line in be59415 (Split create and start, 2016-04-01, opencontainers#384).

Signed-off-by: W. Trevor King <[email protected]>
@wking
Copy link
Contributor Author

wking commented May 31, 2016

On Tue, May 31, 2016 at 09:42:04AM -0700, Mrunal Patel wrote:

Needs rebase.

Rebased with ad803e57b28a16, although I see no changes (besides the
commit date and hash) with:

$ diff -u <(git show ad803e5) <(git show 7b28a16)

I think GitHub just has some buggy conflict-detection code out
recently.

@mrunalp
Copy link
Contributor

mrunalp commented May 31, 2016

LGTM

Approved with PullApprove

@crosbymichael crosbymichael merged commit 991d26c into opencontainers:master May 31, 2016
@wking wking deleted the lifecycle-indent branch June 1, 2016 22:31
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.

4 participants