Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/jclouds-plugin
  Commit: e4f8cdcc8b54c897e626a5aa3f0b179d42b52d93
      
https://github.com/jenkinsci/jclouds-plugin/commit/e4f8cdcc8b54c897e626a5aa3f0b179d42b52d93
  Author: Alexey Skorokhodov <askorokho...@shutterfly.com>
  Date:   2015-06-30 (Tue, 30 Jun 2015)

  Changed paths:
    A 
jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/CloudInstanceDefaults.java
    M 
jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsCloud.java
    M 
jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlave.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudInsideJenkinsLiveTest.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudLiveTest.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudTest.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplateTest.java

  Log Message:
  -----------
  JENKINS-29136 fix NPE in getRetentionTime()

I documented the bug here: https://issues.jenkins-ci.org/browse/JENKINS-29136

this NPE was preventing jenkins workers from being deleted when they should 
have been.

I added a defaults class that will be used when parent cloud cannot be resolved
due to whatever reason.


  Commit: 099b4adee5e63e1f60f80895d66f4306c1a89474
      
https://github.com/jenkinsci/jclouds-plugin/commit/099b4adee5e63e1f60f80895d66f4306c1a89474
  Author: Fritz Elfert <fr...@fritz-elfert.de>
  Date:   2015-09-12 (Sat, 12 Sep 2015)

  Changed paths:
    A 
jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/CloudInstanceDefaults.java
    M 
jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsCloud.java
    M 
jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlave.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudInsideJenkinsLiveTest.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudLiveTest.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudTest.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplateTest.java

  Log Message:
  -----------
  Merge branch 'ask-fix-NPE-retention-time' of 
git://github.com/alexeyOnGitHub/jclouds-plugin into 
alexeyOnGitHub-ask-fix-NPE-retention-time

Conflicts:
        
jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsCloud.java
        
jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlave.java
        
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudInsideJenkinsLiveTest.java
        
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudLiveTest.java
        
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudTest.java
        
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplateTest.java


  Commit: 91f4081bcf37db9c009f616a4da29dd3b769476f
      
https://github.com/jenkinsci/jclouds-plugin/commit/91f4081bcf37db9c009f616a4da29dd3b769476f
  Author: Fritz Elfert <fr...@fritz-elfert.de>
  Date:   2015-09-12 (Sat, 12 Sep 2015)

  Changed paths:
    M 
jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsCloud.java
    M 
jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlave.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudInsideJenkinsLiveTest.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudLiveTest.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudTest.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplateTest.java

  Log Message:
  -----------
  Remove static imports


  Commit: 09507788190dd327e59878481a1b597f76f21056
      
https://github.com/jenkinsci/jclouds-plugin/commit/09507788190dd327e59878481a1b597f76f21056
  Author: Fritz Elfert <fr...@fritz-elfert.de>
  Date:   2015-09-12 (Sat, 12 Sep 2015)

  Changed paths:
    A 
jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/CloudInstanceDefaults.java
    M 
jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsCloud.java
    M 
jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlave.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudInsideJenkinsLiveTest.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudLiveTest.java
    M 
jclouds-plugin/src/test/java/jenkins/plugins/jclouds/compute/JCloudsCloudTest.java

  Log Message:
  -----------
  Merge pull request #95 from 
OpenDataSpace/alexeyOnGitHub-ask-fix-NPE-retention-time

Alexey on GitHub ask fix npe retention time


Compare: 
https://github.com/jenkinsci/jclouds-plugin/compare/e7c71927368d...09507788190d

-- 
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/d/optout.

Reply via email to