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

Fix sync problems in #5246 #7799

Merged
merged 3 commits into from
May 6, 2015
Merged

Conversation

cjcullen
Copy link
Member

@cjcullen cjcullen commented May 5, 2015

One minor change to #5246 to fix some concurrent modification issues.

@cjcullen
Copy link
Member Author

cjcullen commented May 5, 2015

E2Es pass. Waiting to see if race-detector finds anything else...

tkulczynski and others added 2 commits May 5, 2015 16:10
…to disable allocation CIDRs for Pods. Fixed synchornization bug in NodeController registerNodes().
@roberthbailey
Copy link
Contributor

Travis and Shippable are both happy. Merging now and I'll keep an eye on Jenkins.

roberthbailey added a commit that referenced this pull request May 6, 2015
@roberthbailey roberthbailey merged commit 06c2f4e into kubernetes:master May 6, 2015
@jszczepkowski
Copy link
Contributor

Great thanks for finishing this!

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

5 participants