Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/workflow-plugin
  Commit: 7a9cd49dd91bcb4a59aea333c245de9d6a75bcab
      
https://github.com/jenkinsci/workflow-plugin/commit/7a9cd49dd91bcb4a59aea333c245de9d6a75bcab
  Author: Jesse Glick <[email protected]>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M 
flow-support/src/main/java/org/jenkinsci/plugins/workflow/support/steps/WorkspaceStep.java

  Log Message:
  -----------
  Have to pass along the leased path, not the original!


  Commit: 9cec0b5c12050e87c02d64ad289e0af31c88dbc1
      
https://github.com/jenkinsci/workflow-plugin/commit/9cec0b5c12050e87c02d64ad289e0af31c88dbc1
  Author: Jesse Glick <[email protected]>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M job/src/test/java/org/jenkinsci/plugins/workflow/job/WorkflowTest.java

  Log Message:
  -----------
  Have to create a slave with two executors for acquireWorkspace to run 
properly.
Also the wait condition for the second build to be suspended on watch was 
incorrect.


  Commit: 38640c32cbbc7b76249969b28a648d2e3ddbea57
      
https://github.com/jenkinsci/workflow-plugin/commit/38640c32cbbc7b76249969b28a648d2e3ddbea57
  Author: Jesse Glick <[email protected]>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M README.md
    A cps/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBuiltinSteps.java
    M cps/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
    M cps/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java
    M cps/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java
    M 
cps/src/test/groovy/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionTest.groovy
    M 
cps/src/test/groovy/org/jenkinsci/plugins/workflow/cps/LogActionTest.groovy
    M 
durable-task-step/src/main/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStep.java
    M 
flow-support/src/main/resources/org/jenkinsci/plugins/workflow/support/visualization/table/FlowGraphTable/ajax.jelly
    M 
job/src/test/groovy/org/jenkinsci/plugins/workflow/job/WorkflowJobNonRestartingTest.groovy
    M job/src/test/java/org/jenkinsci/plugins/workflow/job/WorkflowRunTest.java
    M job/src/test/java/org/jenkinsci/plugins/workflow/job/WorkflowTest.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:jenkinsci/workflow-plugin

Conflicts:
        job/src/test/java/org/jenkinsci/plugins/workflow/job/WorkflowTest.java


Compare: 
https://github.com/jenkinsci/workflow-plugin/compare/031c22cca2fc...38640c32cbbc

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