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

Add a per machine instance cap and fix instance cap limit calculation #34

Merged
merged 2 commits into from
Jun 17, 2014

Conversation

jocelyndrw
Copy link
Contributor

Hey,

As said in the commit message the code for the instance cap limit fix is not mine and mainly comes from the EC2 Plugin.

(If you want me to do a separated pull request for the fix just ask ;) )

Jocelyn

Jocelyn De La Rosa added 2 commits June 16, 2014 19:49
Use of a static synchronized hashmap `provisioningAmis` to keep track of the
number of containers per images being provisioned.
This code mainly comes from the jenkins ec2-plugin so all the credit goes to
its authors.
@cloudbees-pull-request-builder

plugins » docker-plugin #43 SUCCESS
This pull request looks good

magnayn added a commit that referenced this pull request Jun 17, 2014
Add a per machine instance cap and fix instance cap limit calculation
@magnayn magnayn merged commit 7c5863c into jenkinsci:master Jun 17, 2014
@magnayn
Copy link
Contributor

magnayn commented Jun 17, 2014

Thanks for doing 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.

3 participants