Branch: refs/heads/dev Home: https://github.com/jenkinsci/kubernetes-cd-plugin Commit: a5a560af330b6ea1594b406516eaeaf365739ec4 https://github.com/jenkinsci/kubernetes-cd-plugin/commit/a5a560af330b6ea1594b406516eaeaf365739ec4 Author: Jie Shen <drfish...@gmail.com> Date: 2019-06-17 (Mon, 17 Jun 2019)
Changed paths: M README.md M src/main/java/com/microsoft/jenkins/kubernetes/KubernetesClientWrapper.java M src/main/java/com/microsoft/jenkins/kubernetes/ResourceUpdateMonitor.java Log Message: ----------- Fix conflict (#84) -- 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/kubernetes-cd-plugin/push/refs/heads/dev/93f230-a5a560%40github.com. For more options, visit https://groups.google.com/d/optout.