Re: mesos git commit: Windows: Added `slave/status_update_manager.cpp` and other files.

[Michael Park]

Sorry, I accidentally messed this one up while resolving conflicts and such.

*Review:* https://reviews.apache.org/r/43418/

On 29 February 2016 at 02:10, <mp...@apache.org> wrote:

> Repository: mesos
> Updated Branches:
>   refs/heads/master 3f7501b81 -> 0fd95ccc5
>
>
> Windows: Added `slave/status_update_manager.cpp` and other files.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
> Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0fd95ccc
> Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0fd95ccc
> Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0fd95ccc
>
> Branch: refs/heads/master
> Commit: 0fd95ccc54e4d144c3eb60e98bf77d53b6bdab63
> Parents: 3f7501b
> Author: Alex Clemmer <clemmer.alexan...@gmail.com>
> Authored: Mon Feb 29 04:50:48 2016 -0500
> Committer: Michael Park <mp...@apache.org>
> Committed: Mon Feb 29 05:01:18 2016 -0500
>
> ----------------------------------------------------------------------
>  src/CMakeLists.txt | 13 ++++++-------
>  1 file changed, 6 insertions(+), 7 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/mesos/blob/0fd95ccc/src/CMakeLists.txt
> ----------------------------------------------------------------------
> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
> index 4fbe4da..a62042f 100644
> --- a/src/CMakeLists.txt
> +++ b/src/CMakeLists.txt
> @@ -209,10 +209,15 @@ set(SCHEDULER_SRC
>  set(AGENT_SRC
>    ${AGENT_SRC}
>    slave/constants.cpp
> +  slave/http.cpp
>    slave/metrics.cpp
>    slave/paths.cpp
> +  slave/qos_controller.cpp
> +  slave/qos_controllers/noop.cpp
> +  slave/resource_estimators/noop.cpp
>    slave/state.cpp
> -  slave/resource_estimator.cpp
> +  slave/status_update_manager.cpp
> +  slave/validation.cpp
>    )
>
>  if (NOT WIN32)
> @@ -220,13 +225,8 @@ if (NOT WIN32)
>      ${AGENT_SRC}
>      slave/gc.cpp
>      slave/flags.cpp
> -    slave/http.cpp
>      slave/monitor.cpp
> -    slave/qos_controller.cpp
> -    slave/qos_controllers/noop.cpp
>      slave/slave.cpp
> -    slave/status_update_manager.cpp
> -    slave/validation.cpp
>      slave/containerizer/composing.cpp
>      slave/containerizer/composing.hpp
>      slave/containerizer/containerizer.cpp
> @@ -255,7 +255,6 @@ if (NOT WIN32)
>      slave/containerizer/mesos/provisioner/docker/puller.cpp
>      slave/containerizer/mesos/provisioner/docker/registry_puller.cpp
>      slave/containerizer/mesos/provisioner/docker/store.cpp
> -    slave/resource_estimators/noop.cpp
>      )
>  endif (NOT WIN32)
>
>
>