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

Merge branch 'pull-877' 

Conflicts:
	core/src/main/java/hudson/slaves/SlaveComputer.java
parents c3837b6c eb910e34
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