Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/ec2-plugin
  Commit: 8628f0b61336754141c38b3cecede7dbc37811bd
      
https://github.com/jenkinsci/ec2-plugin/commit/8628f0b61336754141c38b3cecede7dbc37811bd
  Author: Mike Bayer <[email protected]>
  Date:   2012-11-17 (Sat, 17 Nov 2012)

  Changed paths:
    M src/main/java/hudson/plugins/ec2/EC2Slave.java

  Log Message:
  -----------
  - rework terminate() and idleTimeout() so that the Amazon instructions are in 
indepdendent
methods stop() and terminateInstance()
- terminate() falls back to stop() if the termination command fails; this to 
ensure that the EC2
instance is stopped in case the instance has termination protection on it, as 
it is observed
that EC2 will provision an existing stopped/termination-protected instance in 
some cases


  Commit: 9101f7ec54e5795e07a67d24014fed30f32cc7f5
      
https://github.com/jenkinsci/ec2-plugin/commit/9101f7ec54e5795e07a67d24014fed30f32cc7f5
  Author: Mike Bayer <[email protected]>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    M src/main/java/hudson/plugins/ec2/EC2Slave.java

  Log Message:
  -----------
  Merge branch 'terminate_fallback'

Conflicts:
        src/main/java/hudson/plugins/ec2/EC2Slave.java


  Commit: f0d1e98468f8c82a14554a66199be506049be8e4
      
https://github.com/jenkinsci/ec2-plugin/commit/f0d1e98468f8c82a14554a66199be506049be8e4
  Author: Francis Upton <[email protected]>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    M src/main/java/hudson/plugins/ec2/EC2Slave.java

  Log Message:
  -----------
  Merge pull request #33 from zzzeek/master

fallback a manual or timeout-based terminate to stop if terminate fails


Compare: 
https://github.com/jenkinsci/ec2-plugin/compare/a4e404cc52f1...f0d1e98468f8

-- 
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/groups/opt_out.


Reply via email to