----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/17976/ -----------------------------------------------------------
(Updated Feb. 18, 2014, 11:24 a.m.) Review request for mesos, Benjamin Hindman, Ben Mahler, and Vinod Kone. Changes ------- There have been some discussion to change names of variables. Given that 18144 moves this code to 'src/common' and there's no functional changes requested, I'd like to take care of those fixes in that review. Bugs: MESOS-692 https://issues.apache.org/jira/browse/MESOS-692 Repository: mesos-git Description ------- See summary. old format of master/state.json: {... "slaves":[... "resources":{"ports":"[31000-32000]"}} ...] ...} new format: {... "slaves":[... "resources":{"*":{"ports":"[31000-32000]"}}} ...] ...} There is an assumption that there is each resource has a unique role. If this is not the case (ie, if there are multiple resources with the role '*' a warning is emitted. The solution for this is to correctly handle merging of resources with the same role. Diffs ----- src/master/http.cpp 966eed6d8340038265ef799f1b6149502ccc606e src/slave/http.cpp c4f598faf6807214608cc89a6d9cf665133f95f3 src/webui/master/static/js/controllers.js afb24fb9c2184772f7314162f5637dbabaa2ab94 Diff: https://reviews.apache.org/r/17976/diff/ Testing ------- make check Thanks, Dominic Hamon