Branch: refs/heads/master Home: https://github.com/jenkinsci/gerrit-trigger-plugin Commit: 388ee68cc75ba04b10ce19c702af3f7e1dce768c https://github.com/jenkinsci/gerrit-trigger-plugin/commit/388ee68cc75ba04b10ce19c702af3f7e1dce768c Author: Allen Wild <allenwil...@gmail.com> Date: 2018-03-01 (Thu, 01 Mar 2018)
Changed paths: M src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java Log Message: ----------- [JENKINS-49813] RunningJobs: Remove extra shouldCancelPatchsetNumber check An extra check for !shouldCancelPatchsetNumber after the check for (!abortBecauseOfTopic && !shouldCancelpatchsetNumber) breaks the "Abort patch sets with same topic" feature. It appears that these lines were added inadvertently during merge conflict resolution in 7455d86c5d0eaf72743094d64e5faa23b1a5bf82. Removing this extra if block allows for cancelling running jobs when a new patchset arrives on the same topic. Signed-off-by: Allen Wild <allenwil...@gmail.com> Commit: a3bf98d1d4342900137a2739f3a7333ecf710898 https://github.com/jenkinsci/gerrit-trigger-plugin/commit/a3bf98d1d4342900137a2739f3a7333ecf710898 Author: Robert Sandell <rsand...@cloudbees.com> Date: 2018-03-28 (Wed, 28 Mar 2018) Changed paths: M src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java Log Message: ----------- Merge pull request #356 from aswild/jenkins-49813 [JENKINS-49813] RunningJobs: Remove extra shouldCancelPatchsetNumber check Compare: https://github.com/jenkinsci/gerrit-trigger-plugin/compare/1428ff806971...a3bf98d1d434 -- 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.