Repository: mesos Updated Branches: refs/heads/master 547d911a7 -> feb1f568d
Added a Conflict HTTP Response. Review: https://reviews.apache.org/r/35939 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/feb1f568 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/feb1f568 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/feb1f568 Branch: refs/heads/master Commit: feb1f568de837c881986d76543761349306aa8ba Parents: 547d911 Author: Isabel Jimenez <[email protected]> Authored: Wed Jul 1 14:07:53 2015 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Wed Jul 1 14:07:54 2015 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/include/process/http.hpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/feb1f568/3rdparty/libprocess/include/process/http.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/http.hpp b/3rdparty/libprocess/include/process/http.hpp index 2fbca5b..5d5f3cc 100644 --- a/3rdparty/libprocess/include/process/http.hpp +++ b/3rdparty/libprocess/include/process/http.hpp @@ -452,6 +452,21 @@ struct NotAcceptable : Response }; +struct Conflict : Response +{ + Conflict() + { + status = "409 Conflict"; + } + + explicit Conflict(const std::string& body) + : Response(body) + { + status = "409 Conflict"; + } +}; + + struct InternalServerError : Response { InternalServerError()
