Skip to content
Commit 3abc2d5b authored by Kohsuke Kawaguchi's avatar Kohsuke Kawaguchi
Browse files

Merge commit 'ad343a68' 

Conflicts:
	core/pom.xml
	core/src/main/java/hudson/model/Node.java
	test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
parents 995f402f ad343a68
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment