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.

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

kubelet/rkt: Add GetPods() for rkt. #7599

Merged
merged 1 commit into from May 1, 2015
Merged

Conversation

yifan-gu
Copy link
Contributor

@vmarmol vmarmol self-assigned this Apr 30, 2015
@vmarmol
Copy link
Contributor

vmarmol commented Apr 30, 2015

Looks like a rebase is needed @yifan-gu :)

@yifan-gu
Copy link
Contributor Author

@vmarmol Yea, this conflicts with #7555 and #7589
Will rebase after those. But you can give a look if you want :)

@vmarmol
Copy link
Contributor

vmarmol commented Apr 30, 2015

From a cursory glance, it looks good.

@yifan-gu
Copy link
Contributor Author

yifan-gu commented May 1, 2015

Rebased @vmarmol

@vmarmol
Copy link
Contributor

vmarmol commented May 1, 2015

LGTM

@vmarmol
Copy link
Contributor

vmarmol commented May 1, 2015

@yifan-gu 2 needed rebase it seems, this one

vmarmol added a commit that referenced this pull request May 1, 2015
kubelet/rkt: Add GetPods() for rkt.
@vmarmol vmarmol merged commit eb580dc into kubernetes:master May 1, 2015
@yifan-gu yifan-gu deleted the rkt_getpods branch May 7, 2015 17:29
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.

None yet

3 participants