Skip to content
This repository has been archived by the owner on Sep 18, 2020. It is now read-only.

Revert "Merge pull request #2308 from sapcc/master" #2535

Merged
merged 1 commit into from
Apr 24, 2017

Conversation

euank
Copy link
Contributor

@euank euank commented Apr 24, 2017

This reverts commit 14be7e8, reversing
changes made to 144812b.

See coreos/bugs#1892

Fixing that issue correctly turns out to be more complicated than expected (requiring patching rkt fly), so let's hold this fix out of stable for one more cycle.

It's better to have the state of the world before this (kubelet-wrapper boots, but doesn't have logs plumbed out unless you manually add mounts) than after (kubelet-wrapper fails to boot if you had configured logs).

This reverts commit 14be7e8, reversing
changes made to 144812b.
Copy link
Contributor

@dm0- dm0- left a comment

Choose a reason for hiding this comment

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

I don't see how the OpenSSL commit is involved, but LGTM.

@euank
Copy link
Contributor Author

euank commented Apr 24, 2017

@dm0- autogenerated git revert ... -m message, just telling you which git parent it was thinking about when it reverted the merge I think.

@euank euank merged commit 84f4f2c into coreos:build-1353 Apr 24, 2017
@euank euank deleted the revert-var-log branch April 24, 2017 21:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants