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

Merge branch 'master' into JENKINS-26445-pagination-search

* 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
parents 986530a7 4ea5246b
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