Branch: refs/heads/master
Home: https://github.com/jenkinsci/puppet-jenkins
Commit: d46e0f983aef2141f34af49a9066bf1af97bc6b7
https://github.com/jenkinsci/puppet-jenkins/commit/d46e0f983aef2141f34af49a9066bf1af97bc6b7
Author: Joshua Hoblitt <[email protected]>
Date: 2016-04-03 (Sun, 03 Apr 2016)
Changed paths:
M manifests/init.pp
M manifests/slave.pp
M spec/classes/jenkins_slave_spec.rb
Log Message:
-----------
allow master + swarm client to coexist on the same node
Commit: 52a55606cd6133b503289a03c90d6c0b92961711
https://github.com/jenkinsci/puppet-jenkins/commit/52a55606cd6133b503289a03c90d6c0b92961711
Author: Joshua Hoblitt <[email protected]>
Date: 2016-04-03 (Sun, 03 Apr 2016)
Changed paths:
M manifests/init.pp
M manifests/slave.pp
M spec/classes/jenkins_slave_spec.rb
Log Message:
-----------
Merge pull request #545 from jhoblitt/feature/master_slave_on_same_node
allow master + swarm client to coexist on the same node
Compare:
https://github.com/jenkinsci/puppet-jenkins/compare/6a5ba55e607e...52a55606cd61
--
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.
