From f1a6f1d2c1be0ea7fc59e47bbe63358dcd8c8bcb Mon Sep 17 00:00:00 2001 From: tamarrow Date: Mon, 24 Apr 2017 11:06:39 -0700 Subject: [PATCH] mesos: update slave terminology to agent (#973) --- cli/dcoscli/node/main.py | 2 +- dcos/mesos.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/dcoscli/node/main.py b/cli/dcoscli/node/main.py index ebd7f4c..d49859f 100644 --- a/cli/dcoscli/node/main.py +++ b/cli/dcoscli/node/main.py @@ -493,7 +493,7 @@ def _list(json_, extra_field_names): if output: emitter.publish(output) else: - emitter.publish(errors.DefaultError('No slaves found.')) + emitter.publish(errors.DefaultError('No agents found.')) def _log(follow, lines, leader, slave, component, filters): diff --git a/dcos/mesos.py b/dcos/mesos.py index e440cbb..f353c14 100644 --- a/dcos/mesos.py +++ b/dcos/mesos.py @@ -351,7 +351,7 @@ class Master(object): slaves = self.slaves(fltr) if len(slaves) == 0: - raise DCOSException('No slave found with ID "{}".'.format(fltr)) + raise DCOSException('No agent found with ID "{}".'.format(fltr)) elif len(slaves) > 1: @@ -362,7 +362,7 @@ class Master(object): else: matches = ['\t{0}'.format(s['id']) for s in slaves] raise DCOSException( - "There are multiple slaves with that ID. " + + "There are multiple agents with that ID. " + "Please choose one:\n{}".format('\n'.join(matches))) else: