-
由 Jesse Glick 提交于
Conflicts: core/src/main/java/hudson/EnvVars.java core/src/main/java/hudson/FilePath.java core/src/main/java/hudson/cli/ClientAuthenticationCache.java core/src/main/java/hudson/markup/MyspacePolicy.java core/src/main/java/hudson/model/Computer.java core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java core/src/main/java/hudson/slaves/Channels.java core/src/main/java/hudson/slaves/SlaveComputer.java core/src/main/java/hudson/tasks/Fingerprinter.java core/src/main/java/hudson/tasks/Shell.java core/src/main/java/hudson/tasks/junit/JUnitParser.java core/src/main/java/hudson/tasks/test/DefaultTestResultParserImpl.java core/src/main/java/hudson/util/ProcessTree.java core/src/main/java/hudson/util/RemotingDiagnostics.java core/src/main/java/jenkins/model/Jenkins.java core/src/test/java/hudson/LauncherTest.java pom.xml test/src/test/java/hudson/tasks/junit/CaseResultTest.java
89cbfc46