Branch: refs/heads/Computer.environment-JENKINS-26552
Home: https://github.com/jenkinsci/workflow-plugin
Commit: 7a1f3582bae874e4a6125458bbde83e0599b2688
https://github.com/jenkinsci/workflow-plugin/commit/7a1f3582bae874e4a6125458bbde83e0599b2688
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-02-25 (Wed, 25 Feb 2015)
Log Message:
-----------
Merge branch 'master' into windows-tests
Commit: a177845f6d89cc0e82d966a5e06fc383455fe83a
https://github.com/jenkinsci/workflow-plugin/commit/a177845f6d89cc0e82d966a5e06fc383455fe83a
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M COMPATIBILITY.md
Log Message:
-----------
Merge branch 'master' into windows-tests
Commit: 52e590fb6536612ab48c0d5c00a0364af84c6abf
https://github.com/jenkinsci/workflow-plugin/commit/52e590fb6536612ab48c0d5c00a0364af84c6abf
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M
basic-steps/src/main/resources/org/jenkinsci/plugins/workflow/steps/CatchErrorStep/help.html
Log Message:
-----------
Correcting help text added in 5ade0f0d7e05e91e2db7a02c1486010c2db325e6.
Commit: 3cebd491204e8238b93a96d443a8c538910e5605
https://github.com/jenkinsci/workflow-plugin/commit/3cebd491204e8238b93a96d443a8c538910e5605
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M
scm-step/src/main/java/org/jenkinsci/plugins/workflow/steps/scm/GitStep.java
Log Message:
-----------
Merge branch 'master' into correct-catchError-help
Commit: 2f7a86c9588e4ec6344c1e12f085a9b2bfd22b04
https://github.com/jenkinsci/workflow-plugin/commit/2f7a86c9588e4ec6344c1e12f085a9b2bfd22b04
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M
aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/CoreStepTest.java
Log Message:
-----------
BuildWatcher
Commit: 0e43c783043e03495b11ba47f3fa145934e8b744
https://github.com/jenkinsci/workflow-plugin/commit/0e43c783043e03495b11ba47f3fa145934e8b744
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M
aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/CoreStepTest.java
Log Message:
-----------
Demonstrating that catchError can be replaced with a try block setting
currentBuild.result.
Commit: 4931c20ac3d9bf808c5ada7aebf0650feadcfddc
https://github.com/jenkinsci/workflow-plugin/commit/4931c20ac3d9bf808c5ada7aebf0650feadcfddc
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M
basic-steps/src/main/java/org/jenkinsci/plugins/workflow/steps/CatchErrorStep.java
Log Message:
-----------
More explicit step name.
Commit: e12f0b0c2bc5605bb8614f7fd8a0abc5e5385635
https://github.com/jenkinsci/workflow-plugin/commit/e12f0b0c2bc5605bb8614f7fd8a0abc5e5385635
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M basic-steps/CORE-STEPS.md
M
basic-steps/src/main/resources/org/jenkinsci/plugins/workflow/steps/CatchErrorStep/help.html
Log Message:
-----------
Expanded help text.
Commit: dcb1b2bca45ddb5d14813e643fb67a5eea3c41b6
https://github.com/jenkinsci/workflow-plugin/commit/dcb1b2bca45ddb5d14813e643fb67a5eea3c41b6
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-26 (Thu, 26 Mar 2015)
Changed paths:
M
basic-steps/src/main/resources/org/jenkinsci/plugins/workflow/steps/CatchErrorStep/help.html
Log Message:
-----------
Expanded help text to show a plain try-catch-finally block.
Commit: e189f90fcd8e27a9c513f85d60e8658290ac3ebd
https://github.com/jenkinsci/workflow-plugin/commit/e189f90fcd8e27a9c513f85d60e8658290ac3ebd
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-26 (Thu, 26 Mar 2015)
Changed paths:
M basic-steps/CORE-STEPS.md
Log Message:
-----------
JENKINS-26834 is already implemented.
Commit: ea2b6a6d1e6ba97a7e12089ba258bb9833b0caa6
https://github.com/jenkinsci/workflow-plugin/commit/ea2b6a6d1e6ba97a7e12089ba258bb9833b0caa6
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-26 (Thu, 26 Mar 2015)
Changed paths:
M cps/pom.xml
Log Message:
-----------
[FIXED JENKINS-27271] groovy-cps 1.3
Commit: 71c67f7ad30388bc35cee2a0a40e2b7df1925310
https://github.com/jenkinsci/workflow-plugin/commit/71c67f7ad30388bc35cee2a0a40e2b7df1925310
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Changed paths:
M aggregator/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java
Log Message:
-----------
Using JenkinsRuleExt.waitForCompletion to avoid a random failure.
(cherry picked from commit 780bbf560a866f2101facc18ab800ee8769de70c)
Commit: f6a8a3c808a1fd0de98ec6fe119f042edfcc8810
https://github.com/jenkinsci/workflow-plugin/commit/f6a8a3c808a1fd0de98ec6fe119f042edfcc8810
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Changed paths:
M
cps/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepStartNode.java
Log Message:
-----------
During tests, sometimes StepStartNode.getDescriptor was called for the first
time during the restart, leading to improper display.
Probably this points to an underlying race condition: WorkflowRun.copyLogs
should not run after shutdown.
(cherry picked from commit 011b8c049c72e4ca4d9bc2e078e81962cf8b6647)
Conflicts:
aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/CoreWrapperStepTest.java
Commit: fbb4ccf664ee41debb325c64a63c9588ee85c63c
https://github.com/jenkinsci/workflow-plugin/commit/fbb4ccf664ee41debb325c64a63c9588ee85c63c
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Changed paths:
M
api/src/main/java/org/jenkinsci/plugins/workflow/flow/FlowExecutionList.java
M cps/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
Log Message:
-----------
Attempting to use @Terminator to fix random PushdStepTest.restarting failures.
(cherry picked from commit 140dc53d003bccf46cd14033dd750974a83d2766)
Commit: 4f7f4c9a42d9e8344e29cb5dc3ec7d823bec6ec1
https://github.com/jenkinsci/workflow-plugin/commit/4f7f4c9a42d9e8344e29cb5dc3ec7d823bec6ec1
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Changed paths:
M cps/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java
Log Message:
-----------
Typo.
(cherry picked from commit 36d111b022abaa584f948daeb581769f02b1eb80)
Commit: 63c48220de2d28267915bdee8fc8e1ed415f7b03
https://github.com/jenkinsci/workflow-plugin/commit/63c48220de2d28267915bdee8fc8e1ed415f7b03
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Changed paths:
M aggregator/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java
Log Message:
-----------
Another use of waitForCompletion.
Commit: 24f4496e9654c82dc596cb372da5e6eafa1b4d2f
https://github.com/jenkinsci/workflow-plugin/commit/24f4496e9654c82dc596cb372da5e6eafa1b4d2f
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Changed paths:
M COMPATIBILITY.md
Log Message:
-----------
[JENKINS-27652] Noting.
Commit: 6999573c73277492e6d420184a3bc3f32b94ef2c
https://github.com/jenkinsci/workflow-plugin/commit/6999573c73277492e6d420184a3bc3f32b94ef2c
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Log Message:
-----------
Merge commit 'a177845'
Commit: 5b5e6bcbe059dd65961f17404d21355beeb7ccf5
https://github.com/jenkinsci/workflow-plugin/commit/5b5e6bcbe059dd65961f17404d21355beeb7ccf5
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Changed paths:
M COMPATIBILITY.md
Log Message:
-----------
Merge branch 'master' of github.com:jenkinsci/workflow-plugin
Commit: 588234e287815619f48077e925693d8a753f1c3e
https://github.com/jenkinsci/workflow-plugin/commit/588234e287815619f48077e925693d8a753f1c3e
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Changed paths:
M
aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/CoreStepTest.java
M basic-steps/CORE-STEPS.md
M
basic-steps/src/main/java/org/jenkinsci/plugins/workflow/steps/CatchErrorStep.java
M
basic-steps/src/main/resources/org/jenkinsci/plugins/workflow/steps/CatchErrorStep/help.html
Log Message:
-----------
Merge pull request #100 from jglick/correct-catchError-help
Corrected help text for catchError
Commit: f374e5c682f5cbe3f3a8682b01483da59339334b
https://github.com/jenkinsci/workflow-plugin/commit/f374e5c682f5cbe3f3a8682b01483da59339334b
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Changed paths:
M cps/pom.xml
Log Message:
-----------
Merge pull request #103 from jglick/safe-nav-JENKINS-27271
[JENKINS-27271] groovy-cps 1.3
Commit: 8e3c4bd545d12eb9aeb82d23297aa1b4c155233e
https://github.com/jenkinsci/workflow-plugin/commit/8e3c4bd545d12eb9aeb82d23297aa1b4c155233e
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Changed paths:
M aggregator/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java
M
api/src/main/java/org/jenkinsci/plugins/workflow/flow/FlowExecutionList.java
M cps/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
M cps/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java
M
cps/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepStartNode.java
Log Message:
-----------
Merge pull request #102 from jglick/misc-fixes
Misc fixes
Commit: a2e47d635ced1c5eea26a3c74245a6ca84330806
https://github.com/jenkinsci/workflow-plugin/commit/a2e47d635ced1c5eea26a3c74245a6ca84330806
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Changed paths:
M COMPATIBILITY.md
M aggregator/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java
M
aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/CoreStepTest.java
M
api/src/main/java/org/jenkinsci/plugins/workflow/flow/FlowExecutionList.java
M basic-steps/CORE-STEPS.md
M
basic-steps/src/main/java/org/jenkinsci/plugins/workflow/steps/CatchErrorStep.java
M
basic-steps/src/main/resources/org/jenkinsci/plugins/workflow/steps/CatchErrorStep/help.html
M cps/pom.xml
M cps/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
M cps/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java
M
cps/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepStartNode.java
Log Message:
-----------
Merge branch 'master' into Computer.environment-JENKINS-26552
Conflicts:
aggregator/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java
Compare:
https://github.com/jenkinsci/workflow-plugin/compare/9859fde541be...a2e47d635ced
--
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.
