-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/38335/
-----------------------------------------------------------
(Updated Sept. 24, 2015, 2:43 p.m.)
Review request for mesos and Michael Park.
Changes
-------
Resolved code conflict
Bugs: MESOS-3405
https://issues.apache.org/jira/browse/MESOS-3405
Repository: mesos
Description
-------
Currently, `stout/protobuf.hpp` provides a `JSON::Protobuf` utility which
converts a `google::protobuf::Message` into a `JSON::Object`.
We should add the support for `google::protobuf::RepeatedPtrField<T>` by
introducing overloaded functions.
Diffs (updated)
-----
src/common/http.cpp 99b843a
src/docker/executor.cpp 1e49013
src/examples/persistent_volume_framework.cpp 426d338
src/launcher/executor.cpp 50b3c6e
src/master/contender.cpp 67562f1
src/master/http.cpp cd37c91
src/master/maintenance.cpp 5fe9358
src/master/registrar.cpp d81560a
src/slave/containerizer/fetcher.cpp 2b2298c
src/slave/containerizer/mesos/containerizer.cpp b904b2d
src/slave/monitor.cpp 8d8b422
src/tests/containerizer/launch_tests.cpp de655ec
src/tests/fault_tolerance_tests.cpp c97bc46
src/tests/http_api_tests.cpp 7938bbb
src/tests/master_maintenance_tests.cpp 89ad138
src/tests/master_tests.cpp f26344d
src/tests/mesos.hpp 3e58b45
src/tests/mesos.cpp ab2d85b
src/tests/monitor_tests.cpp 583e711
src/tests/reservation_endpoints_tests.cpp 398a2e1
src/tests/resources_tests.cpp 6584fc6
src/tests/script.cpp bcc1fab
src/tests/slave_tests.cpp dccdbb0
src/usage/main.cpp 86fd796
Diff: https://reviews.apache.org/r/38335/diff/
Testing
-------
make
make check
Thanks,
Klaus Ma
