You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@mesos.apache.org by Benjamin Mahler <be...@gmail.com> on 2013/10/23 21:34:23 UTC
Re: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/mesos
No merge commits on master please!
On Wed, Oct 23, 2013 at 12:31 PM, <dl...@apache.org> wrote:
> 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/979aa3ac
> Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/979aa3ac
> Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/979aa3ac
>
> Branch: refs/heads/master
> Commit: 979aa3ac3c638772a3a2de53bb00a4073c4aa87c
> Parents: 42a503c a538ec1
> Author: Dave Lester <dl...@twitter.com>
> Authored: Wed Oct 23 12:30:43 2013 -0700
> Committer: Dave Lester <dl...@twitter.com>
> Committed: Wed Oct 23 12:30:43 2013 -0700
>
> ----------------------------------------------------------------------
> src/examples/balloon_executor.cpp | 54 +++++++--------
> src/examples/balloon_framework.cpp | 50 ++++++--------
> src/java/mesos.pom.in | 4 +-
> src/slave/cgroups_isolator.cpp | 108 ++++++------------------------
> src/slave/cgroups_isolator.hpp | 9 +--
> src/slave/flags.hpp | 12 ----
> src/tests/balloon_framework_test.sh | 11 +--
> src/tests/cgroups_isolator_tests.cpp | 37 ++--------
> src/tests/examples_tests.cpp | 12 ++--
> src/tests/script.cpp | 21 +-----
> src/tests/script.hpp | 39 ++---------
> 11 files changed, 88 insertions(+), 269 deletions(-)
> ----------------------------------------------------------------------
>
>
>