Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/docker-plugin
  Commit: a9429f44e2cd2ede5ff369096e2673b91aa8dc3a
      
https://github.com/jenkinsci/docker-plugin/commit/a9429f44e2cd2ede5ff369096e2673b91aa8dc3a
  Author: Erik Lenoir <erik.len...@zenika.com>
  Date:   2018-11-03 (Sat, 03 Nov 2018)

  Changed paths:
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerSimpleTemplate.java
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplate.java
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplateBase.java
    M 
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderControlOptionRun.java
    M 
src/main/resources/com/nirima/jenkins/plugins/docker/DockerTemplateBase/config.jelly
    M src/test/java/com/nirima/jenkins/plugins/docker/DockerCloudTest.java
    M 
src/test/java/com/nirima/jenkins/plugins/docker/DockerTemplateBaseTest.java
    M src/test/java/com/nirima/jenkins/plugins/docker/DockerTemplateTest.java
    A src/test/resources/seccomp.json

  Log Message:
  -----------
  add capabilities + seccomp fields + tests


  Commit: ccc710febded1eaa1ac5463d90e35056d17b1aad
      
https://github.com/jenkinsci/docker-plugin/commit/ccc710febded1eaa1ac5463d90e35056d17b1aad
  Author: Erik Lenoir <erik.len...@zenika.com>
  Date:   2018-11-05 (Mon, 05 Nov 2018)

  Changed paths:
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplate.java
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplateBase.java
    M 
src/test/java/com/nirima/jenkins/plugins/docker/DockerTemplateBaseTest.java
    M src/test/java/com/nirima/jenkins/plugins/docker/DockerTemplateTest.java

  Log Message:
  -----------
  Better error handling


  Commit: 3688d9477f037c916e2b29097a28d1d3d3740dfc
      
https://github.com/jenkinsci/docker-plugin/commit/3688d9477f037c916e2b29097a28d1d3d3740dfc
  Author: Peter Darton <pjdar...@gmail.com>
  Date:   2020-04-14 (Tue, 14 Apr 2020)

  Changed paths:
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplate.java
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplateBase.java
    M 
src/main/resources/com/nirima/jenkins/plugins/docker/DockerTemplateBase/config.jelly
    M src/test/java/com/nirima/jenkins/plugins/docker/DockerCloudTest.java
    M 
src/test/java/com/nirima/jenkins/plugins/docker/DockerTemplateBaseTest.java
    M src/test/java/com/nirima/jenkins/plugins/docker/DockerTemplateTest.java

  Log Message:
  -----------
  Merge branch 'add_capabilities_seccomp' of
https://github.com/elenoir/docker-plugin into
elenoir-add_capabilities_seccomp

Note: master now has securityOpts field, so this reduces the scope of
this branch to just the add/drop capabilities fields.

Conflicts:
        src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplate.java
        src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplateBase.java
        
src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderControlOptionRun.java
        
src/main/resources/com/nirima/jenkins/plugins/docker/DockerTemplateBase/config.jelly
        src/test/java/com/nirima/jenkins/plugins/docker/DockerCloudTest.java
        
src/test/java/com/nirima/jenkins/plugins/docker/DockerTemplateBaseTest.java
        src/test/java/com/nirima/jenkins/plugins/docker/DockerTemplateTest.java


  Commit: c2700bad9332ae2ca63a7e0987cce40f33e4fb53
      
https://github.com/jenkinsci/docker-plugin/commit/c2700bad9332ae2ca63a7e0987cce40f33e4fb53
  Author: Peter Darton <pjdar...@gmail.com>
  Date:   2020-04-14 (Tue, 14 Apr 2020)

  Changed paths:
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplate.java
    M src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplateBase.java
    M 
src/main/resources/com/nirima/jenkins/plugins/docker/DockerTemplateBase/config.jelly
    M src/test/java/com/nirima/jenkins/plugins/docker/DockerCloudTest.java
    M 
src/test/java/com/nirima/jenkins/plugins/docker/DockerTemplateBaseTest.java
    M src/test/java/com/nirima/jenkins/plugins/docker/DockerTemplateTest.java

  Log Message:
  -----------
  Merge https://github.com/jenkinsci/docker-plugin/pull/696

Adds facility to add/drop capability when defining a template.


Compare: 
https://github.com/jenkinsci/docker-plugin/compare/f1026ea74313...c2700bad9332

-- 
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.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/docker-plugin/push/refs/heads/master/f1026e-c2700b%40github.com.

Reply via email to