Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
with
23 additions
and 165 deletions.
- +11 −1 changelog.html
- +1 −1 cli/pom.xml
- +1 −1 core/pom.xml
- +1 −1 core/src/main/java/hudson/model/Executor.java
- +2 −2 core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
- +0 −67 ips/jenkins.xml
- +0 −51 ips/proto.py
- +0 −9 ips/readme.txt
- +4 −4 plugins/pom.xml
- +1 −1 pom.xml
- +1 −1 test/pom.xml
- +1 −26 war/pom.xml