Repository: mesos Updated Branches: refs/heads/master 9c3ae0448 -> f4439c425
Added common media type constants for the HTTP API. Review: https://reviews.apache.org/r/36360 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f4439c42 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f4439c42 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f4439c42 Branch: refs/heads/master Commit: f4439c4258f5e0b4625ecce445f3de3c33a6d336 Parents: 9c3ae04 Author: Isabel Jimenez <[email protected]> Authored: Wed Jul 15 11:09:49 2015 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Wed Jul 15 11:10:55 2015 -0700 ---------------------------------------------------------------------- src/common/http.cpp | 4 ++++ src/common/http.hpp | 2 ++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/f4439c42/src/common/http.cpp ---------------------------------------------------------------------- diff --git a/src/common/http.cpp b/src/common/http.cpp index 73a4de1..2bb1ba8 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -41,6 +41,10 @@ using std::vector; namespace mesos { namespace internal { +const char APPLICATION_JSON[] = "application/json"; +const char APPLICATION_PROTOBUF[] = "application/x-protobuf"; + + // TODO(bmahler): Kill these in favor of automatic Proto->JSON // Conversion (when it becomes available). http://git-wip-us.apache.org/repos/asf/mesos/blob/f4439c42/src/common/http.hpp ---------------------------------------------------------------------- diff --git a/src/common/http.hpp b/src/common/http.hpp index bbd063d..765860f 100644 --- a/src/common/http.hpp +++ b/src/common/http.hpp @@ -35,6 +35,8 @@ namespace internal { class Attributes; class Task; +extern const char APPLICATION_JSON[]; +extern const char APPLICATION_PROTOBUF[]; JSON::Object model(const Resources& resources); JSON::Object model(const hashmap<std::string, Resources>& roleResources);
