----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/36867/#review93225 -----------------------------------------------------------
Ni src/tests/fault_tolerance_tests.cpp (lines 1841 - 1844) <https://reviews.apache.org/r/36867/#comment147544> You should be able to replace these lines with: ` framework1.mutable_labels()->add_labels()->CopyFrom(createLabel("foo", "bar"));` src/tests/fault_tolerance_tests.cpp (lines 1876 - 1879) <https://reviews.apache.org/r/36867/#comment147545> Same as above. src/tests/fault_tolerance_tests.cpp (lines 1951 - 1958) <https://reviews.apache.org/r/36867/#comment147546> This block can be replaced with: ``` EXPECT_EQ( JSON::Value(JSON::Protobuf(createLabel("foo", "bar"))), labelsObject.values[0]); ``` src/tests/master_tests.cpp (lines 3567 - 3577) <https://reviews.apache.org/r/36867/#comment147547> ditto. src/tests/master_tests.cpp (lines 3607 - 3640) <https://reviews.apache.org/r/36867/#comment147548> Same as above. Neil, could you update the code to reflect some of the recent changes regarding labels? You can find the example in MasterTest.TaskLabels test in master_tests.cpp. - Kapil Arya On July 27, 2015, 9:25 p.m., Neil Conway wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/36867/ > ----------------------------------------------------------- > > (Updated July 27, 2015, 9:25 p.m.) > > > Review request for mesos, Adam B, Connor Doyle, and Niklas Nielsen. > > > Bugs: MESOS-2841 > https://issues.apache.org/jira/browse/MESOS-2841 > > > Repository: mesos > > > Description > ------- > > This is intended to support frameworks that want to offer capabilities to the > rest of the cluster (e.g., storage or some arbitrary third-party service). We > want processes running in the cluster to be able to discover these > capabilities; > however, we don't want to commit to a fixed set of capabilities or how those > capabilities should be represented. Hence, this commit represents this > information using freeform key-value pairs, similar to the labels mechanism > already in use elsewhere. > > Jira: MESOS-2841 > > > Diffs > ----- > > include/mesos/mesos.proto a6748d1cd82238f005c6a49c70d22d095462f1ba > src/master/http.cpp 3a1598fad4db03e5f62fd4a6bd26b2bedeee4070 > src/master/master.hpp 2c924addfb4c52d3048ee6ded13ce638145cc93f > src/tests/fault_tolerance_tests.cpp > 7b977f5e8195d9f42b21f36eb36fb156471caa20 > src/tests/master_tests.cpp 05c148ee1660b86428afe4eda718b17052743a8c > > Diff: https://reviews.apache.org/r/36867/diff/ > > > Testing > ------- > > make check > > > Thanks, > > Neil Conway > >