Skip to content

Conversation

@thaJeztah
Copy link
Member

Reverts changes in pkg/term related to OPOST that pulled in through;
3574e6a

And reverted upstream in;
moby/moby@cd35e4b (moby/moby#33577)

Full diff;
moby/moby@c8141a1...cd35e4b

ping @crosbymichael @vieux

Reverts changes in pkg/term related to `OPOST` that pulled in through;
3574e6a

And reverted upstream in;
moby/moby@cd35e4b

Full diff;
moby/moby@c8141a1...cd35e4b

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

Added "cherry-pick" label, but we should only cherry-pick the changes from moby/moby@cd35e4b

@andrewhsu andrewhsu mentioned this pull request Jun 8, 2017
40 tasks
@crosbymichael
Copy link
Contributor

LGTM

@dnephin
Copy link
Contributor

dnephin commented Jun 8, 2017

I removed HeaderSize, and IsArchive from pkg/archive because they weren't used in moby/moby. I can push a commit to this PR which restores them in docker/cli.

Previously these were in docker/docker/pkg/archive, but unused

Signed-off-by: Daniel Nephin <dnephin@docker.com>
@dnephin
Copy link
Contributor

dnephin commented Jun 8, 2017

I pushed a commit which should fix the tests

Copy link
Member Author

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

thanks! LGTM (if green 😇 )

@codecov-io
Copy link

Codecov Report

Merging #166 into master will increase coverage by 0.02%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #166      +/-   ##
==========================================
+ Coverage   45.36%   45.38%   +0.02%     
==========================================
  Files         171      171              
  Lines       11456    11463       +7     
==========================================
+ Hits         5197     5203       +6     
- Misses       5962     5963       +1     
  Partials      297      297

@vieux
Copy link
Contributor

vieux commented Jun 8, 2017

LGTM

@vieux vieux merged commit a74e715 into docker:master Jun 8, 2017
@thaJeztah thaJeztah deleted the update-term branch June 8, 2017 20:53
nobiit pushed a commit to nobidev/docker-cli that referenced this pull request Nov 19, 2025
[17.06] backport Make plugins dir private
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants