* master:
Update the changelog by new merges:
[FIXED JENKINS-30569] HistoryWidget: fix JS syntax error
[FIXED JENKINS-29014] render API link conditional on getApi() presence
[JENKINS-21720] JS alert preventig to leave a configuration page even without formulary changes
add ctags file 'tags' to .gitignore
[maven-release-plugin] prepare release jenkins-1.632
[FIXED JENKINS-29888] Handling all exceptions returned by logRotator
[JENKINS-30742] Fixed possible NPE in AbstractProject.resolveForCLI()
* master: (58 commits)
Changelog: Replace the PR reference by the JIRA issue reference
Noting https://github.com/jenkinsci/jenkins/pull/1818
Noting https://github.com/jenkinsci/jenkins/pull/1804
[JENKINS-30002] Improve Util.isOverridden
Noting #1842
[FIXED JENKINS-30777] this concludes the fix
[JENKINS-30777] also allow slaves to decorate logger
[JENKINS-30777] Generalized the signature to work with Run, not just AbstractBuild.
Diamond operator
[FIXED JENKINS-29876] CheckForNull job in ReverseBuildTrigger
Noting JENKINS-30084 in changelog
[JENKINS-30084] remove extra space
[JENKINS-30084] address feedbacks
[JENKINS-30084] indent back
[JENKINS-30084] fixing test
[JENKINS-30084] fixing test
[JENKINS-30084] enhancing test case
[JENKINS-30084] test added to make sure a flyweight task can be blocked at last minute
[JENKINS-30084] fix regression when flyweight task is blocked by upstream/downstream project
[JENKINS-30084] some more polish
...
For example https://ci.jenkins-ci.org/job/jenkins_main_trunk/4281/testReport/hudson.slaves/CommandLauncherTest/commandSuceedsWithoutChannel/
java.lang.AssertionError:
Expected: a string containing "ERROR: Process terminated with exit code 0"
but: was "… Launching slave agent
$ true
ERROR: Unable to launch the slave agent for dummy
…java.io.EOFException: unexpected stream termination
at hudson.remoting.ChannelBuilder.negotiate(ChannelBuilder.java:333)
at hudson.remoting.ChannelBuilder.build(ChannelBuilder.java:282)
at hudson.slaves.SlaveComputer.setChannel(SlaveComputer.java:365)
at hudson.slaves.CommandLauncher.launch(CommandLauncher.java:130)
at hudson.slaves.SlaveComputer$1.call(SlaveComputer.java:238)
at jenkins.util.ContextResettingExecutorService$2.call(ContextResettingExecutorService.java:46)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334)
at java.util.concurrent.FutureTask.run(FutureTask.java:166)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
at java.lang.Thread.run(Thread.java:722)
"
at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:8)
at hudson.slaves.CommandLauncherTest.commandSuceedsWithoutChannel(CommandLauncherTest.java:67)
[FIXED JENKINS-30084] FlyWeightTasks tied to a label will not cause node provisioning and will be blocked forever.
When a flyweighttask is limited to run on a specific label (e.g. matrix project set restrict where this project can run) if there are no nodes with that label available when it enters the queue then it will immediately move to blocked.
As it is blocked the Node provisioner will not attempt to create any slaves, so the project will sit in the queue forever (or until some other project allocates a slave with the correct label).
* master: (256 commits)
Noting #1817
Noting #1825
updated changelog for release
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release jenkins-1.629
[JENKINS-30139] Oleg wants to keep the data accessible so we have to go for immutable
[JENKINS-30139] Forgot to change this one
[JENKINS-30139] Add @Restricted to prevent external use of internal data
[JENKINS-30139] Switch from a big fat lock to a concurrent collection
[JENKINS-30374] Update obsolete help message
updated changelog for release
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release jenkins-1.628
noting merge of PR#1816 - use slf4j interceptors
Manage commons-logging and log4j as provided, include slf4j adapters for tests.
Exclude commons-logging and log4j in dangerous scopes compile and runtime in plugins as well.
Only exclude commons-logging and log4j in dangerous scopes compile and runtime.
Reintroduce enforcer rules as suggested by @jtnord.
Document allBuilds for Job remote access API
Include slf4j-jdk14 during tests.
...
Conflicts:
war/src/main/webapp/scripts/hudson-behavior.js