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

Oops, let's be careful about licensing. #6429

Merged
merged 2 commits into from
Apr 6, 2015
Merged

Conversation

lavalamp
Copy link
Member

@lavalamp lavalamp commented Apr 3, 2015

@sillsm - Is this acceptable?

@erictune
Copy link
Member

erictune commented Apr 3, 2015

good catch @lavalamp

@lavalamp
Copy link
Member Author

lavalamp commented Apr 4, 2015

oops, I missed a file-- explains why it built locally. Fixed now.

@sillsm
Copy link

sillsm commented Apr 5, 2015

LGTM

@rjnagal
Copy link
Contributor

rjnagal commented Apr 6, 2015

The test failure is due to node controller data race. I think there's a different issue for that.
This looks good for merging.

rjnagal added a commit that referenced this pull request Apr 6, 2015
Oops, let's be careful about licensing.
@rjnagal rjnagal merged commit bfde7e0 into kubernetes:master Apr 6, 2015
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.

5 participants