You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2015/02/12 02:08:14 UTC
mesos git commit: Removed deprecated slave_id from
ReregisterSlaveMessage.
Repository: mesos
Updated Branches:
refs/heads/master 95c448f77 -> edf4d2d2a
Removed deprecated slave_id from ReregisterSlaveMessage.
Review: https://reviews.apache.org/r/30827
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/edf4d2d2
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/edf4d2d2
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/edf4d2d2
Branch: refs/heads/master
Commit: edf4d2d2a0bc66967f0cabc9568aa43dd616064a
Parents: 95c448f
Author: Joerg Schad <jo...@gmail.com>
Authored: Wed Feb 11 17:08:00 2015 -0800
Committer: Benjamin Mahler <be...@gmail.com>
Committed: Wed Feb 11 17:08:01 2015 -0800
----------------------------------------------------------------------
src/messages/messages.proto | 4 ----
src/slave/slave.cpp | 2 --
2 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/edf4d2d2/src/messages/messages.proto
----------------------------------------------------------------------
diff --git a/src/messages/messages.proto b/src/messages/messages.proto
index 55b3a24..58484ae 100644
--- a/src/messages/messages.proto
+++ b/src/messages/messages.proto
@@ -264,10 +264,6 @@ message RegisterSlaveMessage {
message ReregisterSlaveMessage {
- // TODO(bmahler): slave_id is deprecated.
- // 0.21.0: Now an optional field. Always written, never read.
- // 0.22.0: Remove this field.
- optional SlaveID slave_id = 1;
required SlaveInfo slave = 2;
// Resources that are checkpointed by the slave (e.g., persistent
http://git-wip-us.apache.org/repos/asf/mesos/blob/edf4d2d2/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index f39a876..1e60454 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -985,8 +985,6 @@ void Slave::doReliableRegistration(Duration maxBackoff)
// Include checkpointed resources.
message.mutable_checkpointed_resources()->CopyFrom(checkpointedResources);
- // TODO(bmahler): Remove in 0.22.0.
- message.mutable_slave_id()->CopyFrom(info.id());
message.mutable_slave()->CopyFrom(info);
foreachvalue (Framework* framework, frameworks) {