Branch: refs/heads/master Home: https://github.com/jenkinsci/ec2-plugin Commit: ec7e8e17979e60c4af631474611b1144a48b825f https://github.com/jenkinsci/ec2-plugin/commit/ec7e8e17979e60c4af631474611b1144a48b825f Author: ray.sennew...@gmail.com <ray.sennew...@gmail.com> Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths: M src/main/java/hudson/plugins/ec2/EC2AbstractSlave.java M src/main/java/hudson/plugins/ec2/EC2Computer.java M src/main/java/hudson/plugins/ec2/EC2ComputerLauncher.java M src/main/java/hudson/plugins/ec2/EC2OndemandSlave.java M src/main/java/hudson/plugins/ec2/EC2SpotSlave.java M src/main/java/hudson/plugins/ec2/SlaveTemplate.java M src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java Log Message: ----------- Fix for JENKINS-15081. We store the EC2Cloud that a slave belongs to as an attribute in the EC2AbstractSlave class and have a function call to retrieve it in EC2Computer. All references to EC2Cloud.get changed to EC2AbstractSlave.cloud or EC2Computer.getCloud(). This fix allows for us to always know the correct Cloud that an EC2AbstractSlave or EC2Computer belongs to so we can have multiple EC2Clouds configured on one Jenkins instance and have different templates for different clouds and have the instances for each spin up properly. Commit: 11dd6ebe3dac54fa4aff3096feda8bfe967f0241 https://github.com/jenkinsci/ec2-plugin/commit/11dd6ebe3dac54fa4aff3096feda8bfe967f0241 Author: ray.sennew...@gmail.com <ray.sennew...@gmail.com> Date: 2013-04-29 (Mon, 29 Apr 2013) Changed paths: M src/main/java/hudson/plugins/ec2/EC2Computer.java Log Message: ----------- changing reference from EC2Slave to EC2AbstractSlave as it should be. Commit: a169af5ea0e48ffbe8adec88c0e91e9beea96246 https://github.com/jenkinsci/ec2-plugin/commit/a169af5ea0e48ffbe8adec88c0e91e9beea96246 Author: ray.sennew...@gmail.com <ray.sennew...@gmail.com> Date: 2013-04-29 (Mon, 29 Apr 2013) Changed paths: M src/main/java/hudson/plugins/ec2/SlaveTemplate.java Log Message: ----------- Merge branch 'master' of github.com:jenkinsci/ec2-plugin into jenkins-15081 Commit: bcc00dbfe333185a7bd2d95f9b312f55b2bd4a9a https://github.com/jenkinsci/ec2-plugin/commit/bcc00dbfe333185a7bd2d95f9b312f55b2bd4a9a Author: ray.sennew...@gmail.com <ray.sennew...@gmail.com> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M src/main/java/hudson/plugins/ec2/EC2SpotSlave.java Log Message: ----------- Removed getEc2Cloud method and replaced calls to it with calls to cloud.connect() for consistency and as per request from Francis. Also removed null checks for when a cloud is null, as this should never happen. Commit: 5da8f6be66e839e33923cbf5e8b62b0f6c4b7bfc https://github.com/jenkinsci/ec2-plugin/commit/5da8f6be66e839e33923cbf5e8b62b0f6c4b7bfc Author: Francis Upton <franc...@gmail.com> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M src/main/java/hudson/plugins/ec2/EC2AbstractSlave.java M src/main/java/hudson/plugins/ec2/EC2Computer.java M src/main/java/hudson/plugins/ec2/EC2ComputerLauncher.java M src/main/java/hudson/plugins/ec2/EC2OndemandSlave.java M src/main/java/hudson/plugins/ec2/EC2SpotSlave.java M src/main/java/hudson/plugins/ec2/SlaveTemplate.java M src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java Log Message: ----------- Merge pull request #48 from rsennewald/jenkins-15081 Fix to allow multiple EC2Clouds (fix for JENKINS-15081) Compare: https://github.com/jenkinsci/ec2-plugin/compare/881b2b80e488...5da8f6be66e8 -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.