Branch: refs/heads/docker-java
  Home:   https://github.com/jenkinsci/docker-plugin
  Commit: 5faea1c6f38012eca3a8b286737c55d98682cc37
      
https://github.com/jenkinsci/docker-plugin/commit/5faea1c6f38012eca3a8b286737c55d98682cc37
  Author: devpie <[email protected]>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M 
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderControlOptionProvisionAndStart.java

  Log Message:
  -----------
  ProvisionAndStart couldn't be used due to second attempt to start the
container.


  Commit: ace3aa7b2c71c3b1729086698784c664d8ecd5c6
      
https://github.com/jenkinsci/docker-plugin/commit/ace3aa7b2c71c3b1729086698784c664d8ecd5c6
  Author: Senthil Kumar Selvaraj <[email protected]>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M 
src/main/java/com/nirima/jenkins/plugins/docker/DockerComputerLauncher.java
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplate.java
    M 
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderNewTemplate.java
    M 
src/main/resources/com/nirima/jenkins/plugins/docker/DockerTemplate/template.jelly
    M src/test/java/com/nirima/jenkins/plugins/docker/DockerTemplateTest.java

  Log Message:
  -----------
  Make SSH Launch timeout configurable, instead of a hardcoded value of 60s


  Commit: 374e938bed70a1060548c2a9f2b9b2aea6038a2d
      
https://github.com/jenkinsci/docker-plugin/commit/374e938bed70a1060548c2a9f2b9b2aea6038a2d
  Author: Senthil Kumar Selvaraj <[email protected]>
  Date:   2014-11-01 (Sat, 01 Nov 2014)

  Changed paths:
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplate.java

  Log Message:
  -----------
  Provide correct defaults for timeout


  Commit: bc03cd58760dc60f5c8d547fd3ab66741ea2649c
      
https://github.com/jenkinsci/docker-plugin/commit/bc03cd58760dc60f5c8d547fd3ab66741ea2649c
  Author: Uwe Stuehler <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerComputer.java

  Log Message:
  -----------
  Fix a race that may cause commit and push to fail

Defer the super.taskCompleted() call on DockerComputer until we told the
Docker slave node which build it has run last.  The DockerSlave needs
that link to the latest build in order to decide whether it should tag
and push the container.  However, if super.taskCompleted() is called too
early then the slave will already have been taken offline, the node will
have been deleted and slaveShutdown() will never be called.


  Commit: a32b90afdb15e30b94429e3490744fef72d2225c
      
https://github.com/jenkinsci/docker-plugin/commit/a32b90afdb15e30b94429e3490744fef72d2225c
  Author: magnayn <[email protected]>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerComputer.java

  Log Message:
  -----------
  Merge pull request #114 from ustuehler/master

Fix a race that may cause commit and push to fail


  Commit: 368da717078fa2fbd798dd72966b6a777fd2019e
      
https://github.com/jenkinsci/docker-plugin/commit/368da717078fa2fbd798dd72966b6a777fd2019e
  Author: magnayn <[email protected]>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M 
src/main/java/com/nirima/jenkins/plugins/docker/DockerComputerLauncher.java
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplate.java
    M 
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderNewTemplate.java
    M 
src/main/resources/com/nirima/jenkins/plugins/docker/DockerTemplate/template.jelly
    M src/test/java/com/nirima/jenkins/plugins/docker/DockerTemplateTest.java

  Log Message:
  -----------
  Merge pull request #109 from saaadhu/master

Make SSH Launch timeout configurable, instead of a hardcoded value of 60...


  Commit: aaa512ab0c9ff81e7ae24f6288947cf689c4badd
      
https://github.com/jenkinsci/docker-plugin/commit/aaa512ab0c9ff81e7ae24f6288947cf689c4badd
  Author: magnayn <[email protected]>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M 
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderControlOptionProvisionAndStart.java

  Log Message:
  -----------
  Merge pull request #92 from devpie/someFixes

Fixing Option "Provision and Start Container"


  Commit: 95c109ba5784bae9e2a41e6bb56da5933de23bd8
      
https://github.com/jenkinsci/docker-plugin/commit/95c109ba5784bae9e2a41e6bb56da5933de23bd8
  Author: Mike Gilbode <[email protected]>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M 
src/main/java/com/nirima/jenkins/plugins/docker/DockerComputerLauncher.java
    A src/main/java/com/nirima/jenkins/plugins/docker/utils/PortUtils.java

  Log Message:
  -----------
  Wait for SSH port to be available on docker slave.  If using supervisor,
periodically the SSH port is not available when the SSH slave tries to
start and slave launch fails, this seems to solve that.


  Commit: 28f5909f7a7e355e6ac3dbdb8315182aaafd25f4
      
https://github.com/jenkinsci/docker-plugin/commit/28f5909f7a7e355e6ac3dbdb8315182aaafd25f4
  Author: magnayn <[email protected]>
  Date:   2014-12-17 (Wed, 17 Dec 2014)

  Changed paths:
    M 
src/main/java/com/nirima/jenkins/plugins/docker/DockerComputerLauncher.java
    A src/main/java/com/nirima/jenkins/plugins/docker/utils/PortUtils.java

  Log Message:
  -----------
  Merge pull request #126 from gilbode/wait_for_ssh_port

Wait for SSH port to be available on docker slave.  If using supervisor,


  Commit: 9b57a8c01725acc492c7c42044e5eb5346eb63c7
      
https://github.com/jenkinsci/docker-plugin/commit/9b57a8c01725acc492c7c42044e5eb5346eb63c7
  Author: Nigel Magnay <[email protected]>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerComputer.java
    M 
src/main/java/com/nirima/jenkins/plugins/docker/DockerComputerLauncher.java
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplate.java
    M 
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderControlOptionProvisionAndStart.java
    M 
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderNewTemplate.java
    A src/main/java/com/nirima/jenkins/plugins/docker/utils/PortUtils.java
    M 
src/main/resources/com/nirima/jenkins/plugins/docker/DockerTemplate/template.jelly
    M src/test/java/com/nirima/jenkins/plugins/docker/DockerTemplateTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into docker-java

Conflicts:
        
src/main/java/com/nirima/jenkins/plugins/docker/DockerComputerLauncher.java
        
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderControlOptionProvisionAndStart.java


  Commit: 2078fe460ea47beb8a2560556a40c804e0f1e3fa
      
https://github.com/jenkinsci/docker-plugin/commit/2078fe460ea47beb8a2560556a40c804e0f1e3fa
  Author: Andreas Koch <[email protected]>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M 
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderControlOptionStart.java
    M 
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderControlOptionStop.java

  Log Message:
  -----------
  Fixes issue#77: "Docker Cloud name" parameter will be stored


  Commit: 98802cf678dee7a4cfca4dd9f1fad8861713455c
      
https://github.com/jenkinsci/docker-plugin/commit/98802cf678dee7a4cfca4dd9f1fad8861713455c
  Author: magnayn <[email protected]>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M 
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderControlOptionStart.java
    M 
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderControlOptionStop.java

  Log Message:
  -----------
  Merge pull request #127 from akoch/issue-77

Fixes issue#77: "Docker Cloud name" parameter will be stored


  Commit: 943b8aa5a9c70bfec9aa2347b9a0a3dda2d2fa39
      
https://github.com/jenkinsci/docker-plugin/commit/943b8aa5a9c70bfec9aa2347b9a0a3dda2d2fa39
  Author: Nigel Magnay <[email protected]>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M pom.xml
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerCloud.java
    M 
src/main/java/com/nirima/jenkins/plugins/docker/DockerComputerLauncher.java

  Log Message:
  -----------
  Custom version of the docker-java with required extensions.

Signed-off-by: Nigel Magnay <[email protected]>


  Commit: c198810b9e04ea118fac6d14bd1d6843e9de54e5
      
https://github.com/jenkinsci/docker-plugin/commit/c198810b9e04ea118fac6d14bd1d6843e9de54e5
  Author: Nigel Magnay <[email protected]>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M 
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderControlOptionStart.java
    M 
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderControlOptionStop.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into docker-java


Compare: 
https://github.com/jenkinsci/docker-plugin/compare/4c8d00b895a0...c198810b9e04

-- 
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.

Reply via email to