Branch: refs/heads/JENKINS-37778
  Home:   https://github.com/jenkinsci/pipeline-model-definition-plugin
  Commit: dfab9e247559bf258b0aa35e4160cc91b45e0abc
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/dfab9e247559bf258b0aa35e4160cc91b45e0abc
  Author: Robert Sandell <rsand...@cloudbees.com>
  Date:   2016-10-26 (Wed, 26 Oct 2016)

  Changed paths:
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTScriptBlock.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTStage.java
    A 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhen.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidator.java
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Stage.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
    A 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WhenStageTest.java
    A pipeline-model-definition/src/test/resources/simpleWhen.groovy

  Log Message:
  -----------
  [JENKINS-37781] Adding Stage.when to specify if a stage should run or not


  Commit: 9676206a2bc0ec8b93624ae8fc7cf907e8273b4e
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/9676206a2bc0ec8b93624ae8fc7cf907e8273b4e
  Author: Robert Sandell <rsand...@cloudbees.com>
  Date:   2016-10-26 (Wed, 26 Oct 2016)

  Changed paths:
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Stage.groovy
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WhenStageTest.java
    M pipeline-model-definition/src/test/resources/simpleWhen.groovy

  Log Message:
  -----------
  [JENKINS-37781] fixing the compilation of the compiler

and cleaned up some debug echo


  Commit: 819bbdfeb1ba3a6351baf142a558bb5ccdc599af
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/819bbdfeb1ba3a6351baf142a558bb5ccdc599af
  Author: Robert Sandell <rsand...@cloudbees.com>
  Date:   2016-10-26 (Wed, 26 Oct 2016)

  Changed paths:
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhen.java
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
    M pipeline-model-definition/src/main/resources/ast-schema.json
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WhenStageTest.java
    R pipeline-model-definition/src/test/resources/simpleWhen.groovy
    A pipeline-model-definition/src/test/resources/when/simpleWhen.groovy
    A pipeline-model-definition/src/test/resources/when/whenEmpty.groovy
    A pipeline-model-definition/src/test/resources/when/whenException.groovy

  Log Message:
  -----------
  [JENKINS-37781] More tests

Fixed some issues those tests revealed.
Also fixed a bug where the last line of a script or when closure wasn't parsed


  Commit: eddf70b8c5747b8c516752e8c033891b6cfc9daa
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/eddf70b8c5747b8c516752e8c033891b6cfc9daa
  Author: Robert Sandell <rsand...@cloudbees.com>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy

  Log Message:
  -----------
  [JENKINS-37781] Fixed empty when validation


  Commit: d65d3dc3117f30a4502cfa7ad48c7494b9c0915d
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/d65d3dc3117f30a4502cfa7ad48c7494b9c0915d
  Author: Robert Sandell <rsand...@cloudbees.com>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M README.md
    M SYNTAX.md
    M pipeline-model-api/pom.xml
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTPipelineDef.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTStage.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTStep.java
    A 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWrapper.java
    A 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWrappers.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidator.java
    A pipeline-model-declarative-agent/pom.xml
    A 
pipeline-model-declarative-agent/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/DeclarativeAgent.java
    A 
pipeline-model-declarative-agent/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/DeclarativeAgentDescriptor.java
    A 
pipeline-model-declarative-agent/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/DeclarativeAgentScript.java
    M pipeline-model-definition/pom.xml
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Agent.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Root.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Stage.groovy
    A 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Wrappers.groovy
    A 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/WrappersToMap.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
    A 
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/Any.java
    A 
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipeline.java
    A 
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/Label.java
    A 
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/None.java
    M pipeline-model-definition/src/main/resources/ast-schema.json
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ClosureModelTranslator.groovy
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
    A 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/WrappersToMapTranslator.groovy
    A 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineScript.groovy
    A 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/LabelScript.groovy
    A 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/NoneScript.groovy
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AgentTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/EnvironmentTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ToolsTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java
    A 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WrappersTest.java
    A 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/LabelAndOtherFieldAgent.java
    A pipeline-model-definition/src/test/resources/agentAnyInStage.groovy
    A pipeline-model-definition/src/test/resources/agentTypeOrdering.groovy
    A pipeline-model-definition/src/test/resources/environmentInStage.groovy
    A 
pipeline-model-definition/src/test/resources/errors/agentMissingRequiredParam.groovy
    A 
pipeline-model-definition/src/test/resources/errors/agentUnknownParamForType.groovy
    A 
pipeline-model-definition/src/test/resources/errors/invalidWrapperType.groovy
    A 
pipeline-model-definition/src/test/resources/errors/unknownAgentType.groovy
    A 
pipeline-model-definition/src/test/resources/errors/unknownBareAgentType.groovy
    A pipeline-model-definition/src/test/resources/json/agentTypeOrdering.json
    A pipeline-model-definition/src/test/resources/json/environmentInStage.json
    A 
pipeline-model-definition/src/test/resources/json/errors/agentMissingRequiredParam.json
    A 
pipeline-model-definition/src/test/resources/json/errors/agentUnknownParamForType.json
    A 
pipeline-model-definition/src/test/resources/json/errors/invalidWrapperType.json
    A 
pipeline-model-definition/src/test/resources/json/errors/unknownAgentType.json
    A 
pipeline-model-definition/src/test/resources/json/errors/unknownBareAgentType.json
    A pipeline-model-definition/src/test/resources/json/multipleWrappers.json
    A pipeline-model-definition/src/test/resources/json/simpleWrapper.json
    A pipeline-model-definition/src/test/resources/json/toolsInStage.json
    A pipeline-model-definition/src/test/resources/multipleWrappers.groovy
    A 
pipeline-model-definition/src/test/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/LabelAndOtherFieldAgentScript.groovy
    A pipeline-model-definition/src/test/resources/simpleWrapper.groovy
    A pipeline-model-definition/src/test/resources/toolsInStage.groovy
    M pom.xml

  Log Message:
  -----------
  Merge branch 'master' of 
github.com:jenkinsci/pipeline-model-definition-plugin into JENKINS-37781

 Conflicts:
        
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTStage.java
        
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidator.java
        
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Stage.groovy
        
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
        
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
        
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
        
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy


  Commit: b8463d5ab69d6ae10871d80892150fa04d323d82
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/b8463d5ab69d6ae10871d80892150fa04d323d82
  Author: Robert Sandell <rsand...@cloudbees.com>
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
    M pipeline-model-api/pom.xml
    M pipeline-model-declarative-agent/pom.xml
    M pipeline-model-definition/pom.xml
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
    M pom.xml

  Log Message:
  -----------
  Merge branch 'master' of 
github.com:jenkinsci/pipeline-model-definition-plugin into JENKINS-37781


  Commit: efe93beefe8be357adc0cab0e2d319a05502fcda
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/efe93beefe8be357adc0cab0e2d319a05502fcda
  Author: Robert Sandell <rsand...@cloudbees.com>
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
    A 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/AbstractModelASTCodeBlock.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTScriptBlock.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhen.java
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy

  Log Message:
  -----------
  [JENKINS-37781] Split ModelASTScriptBlock and ModelASTWhen

Into having one common ancestor instead of when extending script


  Commit: 8c766601a1394bc2f5652c7a5fd8c6497563f265
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/8c766601a1394bc2f5652c7a5fd8c6497563f265
  Author: Robert Sandell <rsand...@cloudbees.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M pipeline-model-declarative-agent/pom.xml
    M 
pipeline-model-declarative-agent/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/DeclarativeAgent.java
    M 
pipeline-model-declarative-agent/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/DeclarativeAgentDescriptor.java
    M pipeline-model-definition/pom.xml
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/AbstractBuildConditionResponder.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Agent.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/JobProperties.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/MappedClosure.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/NestedModel.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Parameters.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Root.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Stage.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Stages.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/StepsBlock.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Tools.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Triggers.groovy
    M 
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ModelStepLoader.java
    M 
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipeline.java
    A 
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineFromDockerfile.java
    M 
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/Label.java
    M 
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/model/BuildCondition.java
    A 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineFromDockerfileScript.groovy
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AgentTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/LabelAndOtherFieldAgent.java
    A 
pipeline-model-definition/src/test/resources/fromAlternateDockerfile.groovy
    A pipeline-model-definition/src/test/resources/fromDockerfile.groovy

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into JENKINS-37781

 Conflicts:
        
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Stage.groovy


  Commit: ec6f0ea92278c82b854b65710d4fc0e8f65f3413
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/ec6f0ea92278c82b854b65710d4fc0e8f65f3413
  Author: Robert Sandell <rsand...@cloudbees.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    A 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/AbstractModelASTCodeBlock.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTScriptBlock.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTStage.java
    A 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhen.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidator.java
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Stage.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
    M pipeline-model-definition/src/main/resources/ast-schema.json
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
    A 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WhenStageTest.java
    A pipeline-model-definition/src/test/resources/when/simpleWhen.groovy
    A pipeline-model-definition/src/test/resources/when/whenEmpty.groovy
    A pipeline-model-definition/src/test/resources/when/whenException.groovy

  Log Message:
  -----------
  Merge pull request #41 from jenkinsci/JENKINS-37781

[JENKINS-37781] Adding Stage.when to specify if a stage should run


  Commit: 44c8249f6df539cc3477d08b0142813d91001a45
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/44c8249f6df539cc3477d08b0142813d91001a45
  Author: Robert Sandell <rsand...@cloudbees.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    A 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/AbstractModelASTCodeBlock.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTScriptBlock.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTStage.java
    A 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhen.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidator.java
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Stage.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
    M pipeline-model-definition/src/main/resources/ast-schema.json
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
    A 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WhenStageTest.java
    A pipeline-model-definition/src/test/resources/when/simpleWhen.groovy
    A pipeline-model-definition/src/test/resources/when/whenEmpty.groovy
    A pipeline-model-definition/src/test/resources/when/whenException.groovy

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into JENKINS-37778

 Conflicts:
        
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy


  Commit: 5bcea483a16c4c01959ba88ed7486870fc73bcbb
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/5bcea483a16c4c01959ba88ed7486870fc73bcbb
  Author: Robert Sandell <rsand...@cloudbees.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy

  Log Message:
  -----------
  Missed a closing bracket in the merge

Hopefully I put it in the right place


Compare: 
https://github.com/jenkinsci/pipeline-model-definition-plugin/compare/bec0c4be0503...5bcea483a16c

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