You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by dl...@apache.org on 2014/02/21 08:30:22 UTC
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mesos
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/mesos
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4cbad36f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4cbad36f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4cbad36f
Branch: refs/heads/master
Commit: 4cbad36f576f99bb97aaca852e5e8a72662c0e3e
Parents: e1953bc dee9bd9
Author: Dave Lester <dl...@twitter.com>
Authored: Thu Feb 20 23:30:11 2014 -0800
Committer: Dave Lester <dl...@twitter.com>
Committed: Thu Feb 20 23:30:11 2014 -0800
----------------------------------------------------------------------
.../3rdparty/stout/include/stout/json.hpp | 92 ++++++++---
.../3rdparty/stout/tests/json_tests.cpp | 104 ++++++++++++
src/master/registrar.cpp | 162 +++++++++----------
src/master/registrar.hpp | 4 +-
src/master/registry.proto | 2 +-
src/tests/registrar_tests.cpp | 51 ++++--
6 files changed, 293 insertions(+), 122 deletions(-)
----------------------------------------------------------------------