Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-49661] use "agent" for Symbol #3304

Merged
merged 1 commit into from
Feb 23, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/hudson/slaves/DumbSlave.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public DumbSlave(@Nonnull String name, String remoteFS, ComputerLauncher launche
}

@Extension @Symbol({"dumb",
"slave"/*because this is in effect the canonical slave type*/})
"slave", "agent" /*because this is in effect the canonical slave type*/})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure the comment still makes sense

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't create a conflict in the Declarative Pipeline with its use of agent or with other locations where "agent" is already used?

public static final class DescriptorImpl extends SlaveDescriptor {
public String getDisplayName() {
return Messages.DumbSlave_displayName();
Expand Down