OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-14 20:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'oss'

Browse Source 
Conflicts:
	core/src/main/java/hudson/Functions.java
	core/src/main/java/hudson/model/AutoCompletionCandidates.java
	core/src/main/java/hudson/model/ViewDescriptor.java
	core/src/main/resources/lib/hudson/3rdPartyLicenses.jelly
	core/src/main/resources/lib/hudson/newFromList/form.jelly
	core/src/main/resources/lib/hudson/projectViewRow.jelly
	core/src/main/resources/lib/hudson/thirdPartyLicenses.jelly
	core/src/main/resources/lib/layout/renderOnDemand.jelly
	core/src/test/java/hudson/FilePathTest.java
	test/src/test/resources/lib/layout/RenderOnDemandTest/testBehaviour.jelly
	test/src/test/resources/scripts/BehaviorTest/testCssSelectors.jelly
	ui-samples-plugin/src/main/resources/hudson/plugins/ui_samples/JavaScriptProxy/index.jelly
This commit is contained in:
Kohsuke Kawaguchi committed 2011-04-21 15:37:31 -07:00
2 parents f28409ee27 f5209cd4de
commit 3614868694
7 files changed
+44 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/test/java/hudson/FilePathTest.java
+1
View File
@@ -23,6 +23,7 @@
*/
package hudson;
import hudson.remoting.Future;
import hudson.remoting.VirtualChannel;
import hudson.util.IOException2;
import hudson.util.NullStream;