Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/google-compute-engine-plugin
  Commit: 6c6285cedee1b52907bfa9aa26b017ab6fd04d10
      
https://github.com/jenkinsci/google-compute-engine-plugin/commit/6c6285cedee1b52907bfa9aa26b017ab6fd04d10
  Author: Rachel Yen <[email protected]>
  Date:   2019-02-20 (Wed, 20 Feb 2019)

  Changed paths:
    M pom.xml
    M 
src/test/java/com/google/jenkins/plugins/computeengine/ComputeEngineCloudIT.java

  Log Message:
  -----------
  Fixing one-shot merge conflicts (#27)

* Revert "Revert "One shot instances (#13)""

This reverts commit 1d72075d7cef467d6b7625fe9541ad4fa440f2bb.

* Fix test for One shot

* merge conflicts for one-shot


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