8000 vendor: use appc/spec 0.8.6 and k8s.io/kubernetes v1.3.0 by alban · Pull Request #3063 · rkt/rkt · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Feb 24, 2020. It is now read-only.

vendor: use appc/spec 0.8.6 and k8s.io/kubernetes v1.3.0 #3063

Merged
merged 4 commits into from
Aug 15, 2016

Conversation

alban
Copy link
Member
@alban alban commented Aug 12, 2016

And tests/ctx: tolerate incomplete child processes

Based on @steveej's work on #2880. I am taking the couple of patches that are ready, so we can get the vendoring changes merged without having to resolve conflicts on glide.lock while the work in #2880 is getting ready.


/cc @steveej @iaguis

@alban alban added this to the v1.13.0 milestone Aug 12, 2016
@krnowak
Copy link
Collaborator
krnowak commented Aug 12, 2016

Consider using my script from #3055 for bumping the appc/spec version throughout the project. Also, if this is merged, we can followup on #2936.

@lucab
Copy link
Member
lucab commented Aug 12, 2016

Also, tests are failing to build due to API changes.

8000

@alban
Copy link
Member Author
alban commented Aug 12, 2016

Also, tests are failing to build due to API changes.

Ah, I was hoping to only cherry-pick some changes from #2880 to avoid the glide conflicts while the recursive mounts is being fixed. I guess it's not that easy then.

@alban alban force-pushed the alban/vendor-updates-2 branch 2 times, most recently from 29058fb to ef896a1 Compare August 12, 2016 16:18
@alban
Copy link
Member Author
alban commented Aug 12, 2016

I added a patch to fix the tests caused by the vendoring updates. The tests seem to pass now.

I didn't have time to address @krnowak's concern.

@steveej
Copy link
Contributor
steveej commented Aug 12, 2016

LGTM.

@krnowak You'll need to rework #3055 after this, right?

8000

@krnowak
Copy link
Collaborator
krnowak commented Aug 12, 2016

@steveej: Uh, I did not notice your comment. #3055 is merged now. So to update this PR, running the scripts/bump-appc-spec-versionshould be enough.

@alban alban force-pushed the alban/vendor-updates-2 branch from ef896a1 to 9abbcba Compare August 13, 2016 13:45
@alban
Copy link
Member Author
alban commented Aug 13, 2016

@steveej @krnowak Patch updated:

  • rebased on origin/master and reorder commits
  • add a patch after scripts/bump-appc-spec-version

@lucab
Copy link
Member
lucab commented Aug 15, 2016

LGTM too.

@lucab lucab merged commit 59ab8b6 into rkt:master Aug 15, 2016
@lucab lucab mentioned this pull request Aug 18, 2016
15 tasks
antoni pushed a commit to intelsdi-x/rkt that referenced this pull request Sep 9, 2016
Done by the script scripts/bump-appc-spec-version as explained in
rkt#3063 (comment)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants
0