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.

Sign up for GitHub

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

Jump to bottom

fixes data race in node controller #6418

Merged
merged 1 commit into from
Apr 3, 2015
Merged

fixes data race in node controller #6418

merged 1 commit into from
Apr 3, 2015

Conversation

jdef
Copy link
Contributor

@jdef jdef commented Apr 3, 2015

fixes #6416

@googlebot
Copy link

Thanks for your pull request.

It looks like this may be your first contribution to a Google open source project, in which case you'll need to sign a Contributor License Agreement (CLA) at https://cla.developers.google.com/.

If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check the information on your CLA or see this help article on setting the email on your git commits.

Once you've done that, please reply here to let us know. If you signed the CLA as a corporation, please let us know the company's name.

@jdef
Copy link
Contributor Author

jdef commented Apr 3, 2015

I've already signed the CLA as james dot defelice at ishisystems dot com

@jdef
Copy link
Contributor Author

jdef commented Apr 3, 2015

PTAL @yujuhong

@yujuhong
Copy link
Contributor

yujuhong commented Apr 3, 2015

Thanks! The PR LGTM. Will merge on green.

@bgrant0607
Copy link
Member

cc @davidopp

@yujuhong yujuhong self-assigned this Apr 3, 2015
@davidopp
Copy link
Member

davidopp commented Apr 3, 2015

LGTM

Thanks for catching this!

@yujuhong, Shippable is green so I think it's OK for you to merge?

@yujuhong
Copy link
Contributor

yujuhong commented Apr 3, 2015

Yes, travis failed because of #6199. It's a known issue.

yujuhong added a commit that referenced this pull request Apr 3, 2015
@yujuhong
Merge pull request #6418 from jdef/fix_6416
3d1dfd4 
fixes data race in node controller
@yujuhong yujuhong merged commit 3d1dfd4 into kubernetes:master Apr 3, 2015
@jdef
Copy link
Contributor Author

jdef commented Apr 3, 2015

xref d2iq-archive/kubernetes-mesos#199

@jdef jdef deleted the fix_6416 branch April 3, 2015 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@yujuhong yujuhong

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

data race in node-controller error handling
5 participants
@jdef @googlebot @yujuhong @bgrant0607 @davidopp