mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-20 07:22:32 +00:00
Merge branch 'SECURITY-144' into SECURITY-144-rc
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
This commit is contained in:
commit
89cbfc4639
60 files changed
+1200
-301
No files matched your search
@@ -23,12 +23,12 @@
|
||||
*/
|
||||
package hudson;
|
||||
|
||||
import hudson.remoting.Callable;
|
||||
import hudson.remoting.VirtualChannel;
|
||||
import hudson.util.CaseInsensitiveComparator;
|
||||
import hudson.util.CyclicGraphDetector;
|
||||
import hudson.util.CyclicGraphDetector.CycleDetectedException;
|
||||
import hudson.util.VariableResolver;
|
||||
import jenkins.security.MasterToSlaveCallable;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
@@ -404,7 +404,7 @@ public class EnvVars extends TreeMap<String,String> {
|
||||
return channel.call(new GetEnvVars());
|
||||
}
|
||||
|
||||
private static final class GetEnvVars implements Callable<EnvVars,RuntimeException> {
|
||||
private static final class GetEnvVars extends MasterToSlaveCallable<EnvVars,RuntimeException> {
|
||||
public EnvVars call() {
|
||||
return new EnvVars(EnvVars.masterEnvVars);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user