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.

Sign up for GitHub

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

Jump to bottom

runtime: Consistent indent for "However, some actions..." #464

Merged
merged 1 commit into from
May 31, 2016
Merged

runtime: Consistent indent for "However, some actions..." #464

merged 1 commit into from
May 31, 2016

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 •
edited by caniszczyk
Loading

LGTM

Approved with PullApprove

@mrunalp
Copy link
Contributor

mrunalp commented May 31, 2016

Needs rebase.

@wking
runtime: Consistent indent for "However, some actions..."
7b28a16 
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 <wking@tremily.us>
@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 ad803e5 → 7b28a16, 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.

@wking wking mentioned this pull request May 31, 2016
Merged
@mrunalp
Copy link
Contributor

mrunalp commented May 31, 2016 •
edited by caniszczyk
Loading

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
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@wking @hqhq @mrunalp @crosbymichael