Branch: refs/heads/master
Home: https://github.com/jenkinsci/mesos-plugin
Commit: ab4707fa10b470e63490fdb027759c178ea3ce02
https://github.com/jenkinsci/mesos-plugin/commit/ab4707fa10b470e63490fdb027759c178ea3ce02
Author: Steve Hoffman <[email protected]>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M .gitignore
M src/main/java/org/jenkinsci/plugins/mesos/JenkinsScheduler.java
M src/main/java/org/jenkinsci/plugins/mesos/Mesos.java
M src/main/java/org/jenkinsci/plugins/mesos/MesosCloud.java
M src/main/java/org/jenkinsci/plugins/mesos/MesosComputer.java
M src/main/java/org/jenkinsci/plugins/mesos/MesosComputerLauncher.java
A src/main/java/org/jenkinsci/plugins/mesos/MesosImpl.java
M src/main/java/org/jenkinsci/plugins/mesos/MesosSlave.java
M src/main/java/org/jenkinsci/plugins/mesos/MesosSlaveInfo.java
Log Message:
-----------
Fix support for multiple Mesos Clouds
This is to address issue 94:
https://github.com/jenkinsci/mesos-plugin/issues/94
The Mesos object was written to be a singleton
even though Jenkins supports defining more than one.
In my case, I was trying to control 2 different clusters
(with 2 different slave tags). Because the MesosImpl gets created by
whichever slave happens to launch first, slave tags from the other cluster
would launch in the wrong place.
While I don't LOVE this implementation, it seemed the least minimal
impact to a larger refactoring. I basically pass a reference for the
MesosCloud to the MesosSlave. Then I changed the Mesos.getInstance()
to take a parameter which is used as a key in a Map keyed by MesosCloud to
find the correct MesosImpl. It was necessary to externalize the MesosImpl
inner-class to get it to compile.
I also cleaned up some unused imports, code not called, and depricated
use of Hudson for Jenkins. You also can't override interfaces so I removed
some @Override tags
Commit: aa6d7e64ce74791e17a9c37e09daef4c51a53f43
https://github.com/jenkinsci/mesos-plugin/commit/aa6d7e64ce74791e17a9c37e09daef4c51a53f43
Author: Manivannan Selvaraj <[email protected]>
Date: 2015-04-15 (Wed, 15 Apr 2015)
Changed paths:
M .gitignore
M src/main/java/org/jenkinsci/plugins/mesos/JenkinsScheduler.java
M src/main/java/org/jenkinsci/plugins/mesos/Mesos.java
M src/main/java/org/jenkinsci/plugins/mesos/MesosCloud.java
M src/main/java/org/jenkinsci/plugins/mesos/MesosComputer.java
M src/main/java/org/jenkinsci/plugins/mesos/MesosComputerLauncher.java
A src/main/java/org/jenkinsci/plugins/mesos/MesosImpl.java
M src/main/java/org/jenkinsci/plugins/mesos/MesosSlave.java
M src/main/java/org/jenkinsci/plugins/mesos/MesosSlaveInfo.java
Log Message:
-----------
Merge pull request #96 from bacoboy/master
Fix support for multiple Mesos Clouds
Compare:
https://github.com/jenkinsci/mesos-plugin/compare/3f57ee2a2664...aa6d7e64ce74
--
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 [email protected].
For more options, visit https://groups.google.com/d/optout.
