Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/pipeline-model-definition-plugin
  Commit: d95465079b2f354cfba69cfdbaad533de2f18044
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/d95465079b2f354cfba69cfdbaad533de2f18044
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTBuildConditionsContainer.java
    R 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTNotifications.java
    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/validator/ModelValidator.java
    M 
pipeline-model-api/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorTest.java
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/AbstractBuildConditionResponder.groovy
    R 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Notifications.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/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
    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/BasicModelDefTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BuildConditionResponderTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/JobPropertiesTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ParametersTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/PostStageTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/TriggersTest.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/WrappersTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ExecuteConvertedTest.java
    R pipeline-model-definition/src/test/resources/abortedNotification.groovy
    M pipeline-model-definition/src/test/resources/buildConditionOrdering.groovy
    R 
pipeline-model-definition/src/test/resources/errors/duplicateNotificationConditions.groovy
    R 
pipeline-model-definition/src/test/resources/errors/emptyNotifications.groovy
    M 
pipeline-model-definition/src/test/resources/errors/invalidBuildCondition.groovy
    A 
pipeline-model-definition/src/test/resources/errors/notificationsSectionRemoved.groovy
    R 
pipeline-model-definition/src/test/resources/errors/rejectParallelInNotifications.groovy
    R pipeline-model-definition/src/test/resources/failingNotifications.groovy
    M pipeline-model-definition/src/test/resources/failingPipeline.groovy
    M pipeline-model-definition/src/test/resources/failingPostBuild.groovy
    R 
pipeline-model-definition/src/test/resources/json/errors/emptyNotifications.json
    M 
pipeline-model-definition/src/test/resources/json/errors/invalidBuildCondition.json
    A 
pipeline-model-definition/src/test/resources/json/errors/notificationsSectionRemoved.json
    R 
pipeline-model-definition/src/test/resources/json/postBuildAndNotifications.json
    R pipeline-model-definition/src/test/resources/json/simpleNotification.json
    R 
pipeline-model-definition/src/test/resources/notificationOnChangeChanged.groovy
    R 
pipeline-model-definition/src/test/resources/notificationOnChangeFailed.groovy
    R 
pipeline-model-definition/src/test/resources/postBuildAndNotifications.groovy
    A pipeline-model-definition/src/test/resources/postOnChangeChanged.groovy
    A pipeline-model-definition/src/test/resources/postOnChangeFailed.groovy
    R 
pipeline-model-definition/src/test/resources/postStage/failingNotifications.groovy
    M 
pipeline-model-definition/src/test/resources/postStage/globalAndLocalAlways.groovy
    M pipeline-model-definition/src/test/resources/postStage/localAll.groovy
    R pipeline-model-definition/src/test/resources/shInNotification.groovy
    R pipeline-model-definition/src/test/resources/simpleNotification.groovy
    R pipeline-model-definition/src/test/resources/unstableNotification.groovy
    A pipeline-model-definition/src/test/resources/unstablePost.groovy

  Log Message:
  -----------
  [JENKINS-39394] Removed notifications section.


  Commit: 567066b49c0b7cf582377696317f08960bcd7407
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/567066b49c0b7cf582377696317f08960bcd7407
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M pipeline-model-api/pom.xml
    A 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ASTSchema.java
    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/ModelASTPostBuild.java
    A pipeline-model-api/src/main/resources/ast-schema.json
    A 
pipeline-model-api/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ASTSchemaTest.java
    M pipeline-model-definition/pom.xml
    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/parser/Converter.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/java/org/jenkinsci/plugins/pipeline/modeldefinition/endpoints/ModelConverterAction.java
    R pipeline-model-definition/src/main/resources/ast-schema.json
    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/AbstractModelDefTest.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/endpoints/ModelConverterActionTest.java
    M pipeline-model-definition/src/test/resources/buildConditionOrdering.groovy
    M pipeline-model-definition/src/test/resources/buildPluginParentPOM.groovy
    M 
pipeline-model-definition/src/test/resources/errors/duplicatePostBuildConditions.groovy
    M pipeline-model-definition/src/test/resources/errors/emptyPostBuild.groovy
    M 
pipeline-model-definition/src/test/resources/errors/invalidBuildCondition.groovy
    M pipeline-model-definition/src/test/resources/failingPipeline.groovy
    M pipeline-model-definition/src/test/resources/failingPostBuild.groovy
    M 
pipeline-model-definition/src/test/resources/json/errors/emptyPostBuild.json
    M 
pipeline-model-definition/src/test/resources/json/errors/invalidBuildCondition.json
    M pipeline-model-definition/src/test/resources/json/simplePostBuild.json
    M pipeline-model-definition/src/test/resources/postOnChangeChanged.groovy
    M pipeline-model-definition/src/test/resources/postOnChangeFailed.groovy
    M 
pipeline-model-definition/src/test/resources/postStage/globalAndLocalAlways.groovy
    M pipeline-model-definition/src/test/resources/postStage/localAll.groovy
    M pipeline-model-definition/src/test/resources/simplePostBuild.groovy
    M pipeline-model-definition/src/test/resources/unstablePost.groovy

  Log Message:
  -----------
  [FIXED JENKINS-39394] Renamed "postBuild" to "post".

Also moved ast-schema.json to pipeline-model-api, where it should be.


  Commit: ea1478a396a477c569c4c099c9dcbe6d566f6597
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/ea1478a396a477c569c4c099c9dcbe6d566f6597
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M pipeline-model-definition/pom.xml

  Log Message:
  -----------
  Update compatibleSinceVersion since we're breaking syntax again


  Commit: 31152b7bff9093a7af558d938ae69cb9f9a86285
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/31152b7bff9093a7af558d938ae69cb9f9a86285
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ASTSchema.java

  Log Message:
  -----------
  Get rid of superfluous ast-schema.json caching


  Commit: 38dda247f3698ca8f70fd347abd953a31035ee1a
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/38dda247f3698ca8f70fd347abd953a31035ee1a
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-11-04 (Fri, 04 Nov 2016)

  Changed paths:
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
    A 
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineFromDockerfile.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
    A 
pipeline-model-definition/src/test/resources/fromAlternateDockerfile.groovy
    A pipeline-model-definition/src/test/resources/fromDockerfile.groovy

  Log Message:
  -----------
  Merge branch 'master' into jenkins-39394


  Commit: 6a2d0edeefd0a4f00928cdb339efac13e91a2ca0
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/6a2d0edeefd0a4f00928cdb339efac13e91a2ca0
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-11-07 (Mon, 07 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
    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
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/LabelAndOtherFieldAgent.java

  Log Message:
  -----------
  Merge branch 'master' into jenkins-39394

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


  Commit: 5b35b61cd23e16889daeb5d451fe73e3543a2ad9
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/5b35b61cd23e16889daeb5d451fe73e3543a2ad9
  Author: Andrew Bayer <andrew.ba...@gmail.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-api/src/main/resources/ast-schema.json
    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/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 branch 'master' into jenkins-39394

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


  Commit: 6509dfcd7e5ac46bdea280df197c07aa4e6eaa80
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/6509dfcd7e5ac46bdea280df197c07aa4e6eaa80
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M pipeline-model-definition/pom.xml
    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/java/org/jenkinsci/plugins/pipeline/modeldefinition/model/CredentialsBindingHandler.java
    A 
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/steps/CredentialWrapper.java
    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
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/PropertiesToMapTranslator.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/EnvironmentTest.java
    A 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/steps/CredentialWrapperStepTest.java
    A 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/util/HasArchived.java
    A 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/util/InputStreamContainingString.java
    A pipeline-model-definition/src/test/resources/credentials/mixedEnv.groovy
    A pipeline-model-definition/src/test/resources/credentials/noBinding.groovy
    A 
pipeline-model-definition/src/test/resources/credentials/usernamePassword.groovy

  Log Message:
  -----------
  Merge branch 'master' into jenkins-39394

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


  Commit: 06411143c3246d77eab211fca1a8f98019d760d9
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/06411143c3246d77eab211fca1a8f98019d760d9
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

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

  Log Message:
  -----------
  Fixing mis-copy


  Commit: e2b9cb84ff1f0392c4884e32b7434062d98a73ab
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/e2b9cb84ff1f0392c4884e32b7434062d98a73ab
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M SYNTAX.md
    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/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BasicModelDefTest.java

  Log Message:
  -----------
  Merge branch 'jenkins-39631' into jenkins-39394

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


  Commit: 54c17bbbaee2fe7f4667d5cbd1f25586cccc187d
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/54c17bbbaee2fe7f4667d5cbd1f25586cccc187d
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

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

  Log Message:
  -----------
  Removing lurking debug println


  Commit: 6c85f730554803937576a5e9bd6e01b950980f9d
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/6c85f730554803937576a5e9bd6e01b950980f9d
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

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

  Log Message:
  -----------
  Merge branch 'jenkins-39631' into jenkins-39394


  Commit: 72e9a0c69b8b643432b6cf8917e4c3911914685f
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/72e9a0c69b8b643432b6cf8917e4c3911914685f
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

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

  Log Message:
  -----------
  Fixing some merge errors


  Commit: f3c05b3272db59059f08c27d71871323715e611b
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/f3c05b3272db59059f08c27d71871323715e611b
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

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

  Log Message:
  -----------
  Merge branch 'master' into jenkins-39394

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


  Commit: e9b5bf80c16cdf9c2bd57d311f2fb5409ae48a5b
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/e9b5bf80c16cdf9c2bd57d311f2fb5409ae48a5b
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M pipeline-model-api/pom.xml
    A 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ASTSchema.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTBuildConditionsContainer.java
    R 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTNotifications.java
    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/ModelASTPostBuild.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidator.java
    A pipeline-model-api/src/main/resources/ast-schema.json
    A 
pipeline-model-api/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ASTSchemaTest.java
    M 
pipeline-model-api/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorTest.java
    M pipeline-model-definition/pom.xml
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/AbstractBuildConditionResponder.groovy
    R 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Notifications.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/parser/Converter.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/java/org/jenkinsci/plugins/pipeline/modeldefinition/endpoints/ModelConverterAction.java
    R pipeline-model-definition/src/main/resources/ast-schema.json
    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/AbstractModelDefTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BasicModelDefTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BuildConditionResponderTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/JobPropertiesTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ParametersTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/PostStageTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/TriggersTest.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/WrappersTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/endpoints/ModelConverterActionTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ExecuteConvertedTest.java
    R pipeline-model-definition/src/test/resources/abortedNotification.groovy
    M pipeline-model-definition/src/test/resources/buildConditionOrdering.groovy
    M pipeline-model-definition/src/test/resources/buildPluginParentPOM.groovy
    R 
pipeline-model-definition/src/test/resources/errors/duplicateNotificationConditions.groovy
    M 
pipeline-model-definition/src/test/resources/errors/duplicatePostBuildConditions.groovy
    R 
pipeline-model-definition/src/test/resources/errors/emptyNotifications.groovy
    M pipeline-model-definition/src/test/resources/errors/emptyPostBuild.groovy
    M 
pipeline-model-definition/src/test/resources/errors/invalidBuildCondition.groovy
    A 
pipeline-model-definition/src/test/resources/errors/notificationsSectionRemoved.groovy
    R 
pipeline-model-definition/src/test/resources/errors/rejectParallelInNotifications.groovy
    R pipeline-model-definition/src/test/resources/failingNotifications.groovy
    M pipeline-model-definition/src/test/resources/failingPipeline.groovy
    M pipeline-model-definition/src/test/resources/failingPostBuild.groovy
    R 
pipeline-model-definition/src/test/resources/json/errors/emptyNotifications.json
    M 
pipeline-model-definition/src/test/resources/json/errors/emptyPostBuild.json
    M 
pipeline-model-definition/src/test/resources/json/errors/invalidBuildCondition.json
    A 
pipeline-model-definition/src/test/resources/json/errors/notificationsSectionRemoved.json
    R 
pipeline-model-definition/src/test/resources/json/postBuildAndNotifications.json
    R pipeline-model-definition/src/test/resources/json/simpleNotification.json
    M pipeline-model-definition/src/test/resources/json/simplePostBuild.json
    R 
pipeline-model-definition/src/test/resources/notificationOnChangeChanged.groovy
    R 
pipeline-model-definition/src/test/resources/notificationOnChangeFailed.groovy
    R 
pipeline-model-definition/src/test/resources/postBuildAndNotifications.groovy
    A pipeline-model-definition/src/test/resources/postOnChangeChanged.groovy
    A pipeline-model-definition/src/test/resources/postOnChangeFailed.groovy
    R 
pipeline-model-definition/src/test/resources/postStage/failingNotifications.groovy
    M 
pipeline-model-definition/src/test/resources/postStage/globalAndLocalAlways.groovy
    M pipeline-model-definition/src/test/resources/postStage/localAll.groovy
    R pipeline-model-definition/src/test/resources/shInNotification.groovy
    R pipeline-model-definition/src/test/resources/simpleNotification.groovy
    M pipeline-model-definition/src/test/resources/simplePostBuild.groovy
    R pipeline-model-definition/src/test/resources/unstableNotification.groovy
    A pipeline-model-definition/src/test/resources/unstablePost.groovy

  Log Message:
  -----------
  Merge pull request #45 from abayer/jenkins-39394

JENKINS-39394 - Get rid of notifications, rename postBuild to post


Compare: 
https://github.com/jenkinsci/pipeline-model-definition-plugin/compare/58626c6f9206...e9b5bf80c16c

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