Skip to content
Commit 30ece5ff authored by tfennelly's avatar tfennelly
Browse files

Merge branch 'master' into extensionlist-listener

* master:
  Noting merge of JENKINS-28111
  @jglick wants it this way
  Noting merge of JENKINS-28115
  [FIXED JENKINS-28115] Division by zero in Executor.getProgress()
  [FIXED JENKINS-28111] JNLP slave JVM Options are inconsistently applied
  updated changelog for release
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release jenkins-1.611
  remove ips profile
  Now that packaging is in https://github.com/jenkinsci/packaging and given that the ips packaging is stale, we should just drop this
parents a9f03924 9c9049eb
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment