mesos git commit: Initialized tests with Google Mock initialization.

[grag]

Repository: mesos
Updated Branches:
  refs/heads/master 11de04c1b -> c0293a6f7


Initialized tests with Google Mock initialization.

Switched over to explicitly using Google Mock to initialize the test
suite. This enables Google Mock option flags so that --gmock_verbose
will be supported.

Review: https://reviews.apache.org/r/62443/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c0293a6f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c0293a6f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c0293a6f

Branch: refs/heads/master
Commit: c0293a6f7d457a595a3763662e3a9740db31859b
Parents: 11de04c
Author: James Peach 
Authored: Wed Sep 20 14:38:27 2017 -0700
Committer: Greg Mann 
Committed: Wed Sep 20 15:29:02 2017 -0700

--
 src/tests/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/mesos/blob/c0293a6f/src/tests/main.cpp
--
diff --git a/src/tests/main.cpp b/src/tests/main.cpp
index cd30cac..f945ac9 100644
--- a/src/tests/main.cpp
+++ b/src/tests/main.cpp
@@ -90,7 +90,7 @@ int main(int argc, char** argv)
 
   if (flags.help) {
 cout << flags.usage() << endl;
-testing::InitGoogleTest(, argv); // Get usage from gtest too.
+testing::InitGoogleMock(, argv); // Get usage from gtest too.
 return EXIT_SUCCESS;
   }
 
@@ -150,7 +150,7 @@ int main(int argc, char** argv)
   }
 
   // Initialize gmock/gtest.
-  testing::InitGoogleTest(, argv);
+  testing::InitGoogleMock(, argv);
   testing::FLAGS_gtest_death_test_style = "threadsafe";
 
   LOG(INFO) << "Source directory: " << flags.source_dir;

[1/2] mesos git commit: Added port mappings in `NetworkInfo` as part of `state` endpoints.

[mpark]

Repository: mesos
Updated Branches:
  refs/heads/1.4.x b625f9a0f -> f82cd43dc


Added port mappings in `NetworkInfo` as part of `state` endpoints.

Review: https://reviews.apache.org/r/61866/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a7d8997c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a7d8997c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a7d8997c

Branch: refs/heads/1.4.x
Commit: a7d8997ccb4f40087f1503036cee03e2022e2d92
Parents: b625f9a
Author: Deepak Goel 
Authored: Thu Aug 24 16:32:40 2017 -0700
Committer: Michael Park 
Committed: Wed Sep 20 06:05:57 2017 -0700

--
 src/common/http.cpp | 19 +++
 1 file changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/mesos/blob/a7d8997c/src/common/http.cpp
--
diff --git a/src/common/http.cpp b/src/common/http.cpp
index 43d674e..226fed4 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -270,6 +270,16 @@ JSON::Object model(const NetworkInfo& info)
 object.values["name"] = info.name();
   }
 
+  if (info.port_mappings().size() > 0) {
+JSON::Array array;
+array.values.reserve(info.port_mappings().size()); // MESOS-2353
+foreach (const NetworkInfo::PortMapping& portMapping,
+ info.port_mappings()) {
+  array.values.push_back(JSON::protobuf(portMapping));
+}
+object.values["port_mappings"] = std::move(array);
+  }
+
   return object;
 }
 
@@ -630,6 +640,15 @@ static void json(JSON::ObjectWriter* writer, const 
NetworkInfo& info)
   if (info.has_name()) {
 writer->field("name", info.name());
   }
+
+  if (info.port_mappings().size() > 0) {
+writer->field("port_mappings", [](JSON::ArrayWriter* writer) {
+  foreach(const NetworkInfo::PortMapping& portMapping,
+  info.port_mappings()) {
+writer->element(JSON::Protobuf(portMapping));
+  }
+});
+  }
 }
 
 

[2/2] mesos git commit: Added MESOS-7873 to the 1.4.1 CHANGELOG.

[mpark]

Added MESOS-7873 to the 1.4.1 CHANGELOG.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f82cd43d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f82cd43d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f82cd43d

Branch: refs/heads/1.4.x
Commit: f82cd43dc86328eb3f173ce9a3fb3afda1a05ed7
Parents: a7d8997
Author: Michael Park 
Authored: Wed Sep 20 06:07:40 2017 -0700
Committer: Michael Park 
Committed: Wed Sep 20 06:07:40 2017 -0700

--
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/mesos/blob/f82cd43d/CHANGELOG
--
diff --git a/CHANGELOG b/CHANGELOG
index 88bc811..16b1db2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ This release contains the following new features:
 All Resolved Issues:
 
 **Bug
+ * [MESOS-7873] - Expose `ExecutorInfo.ContainerInfo.NetworkInfo` in Mesos 
`state` endpoint.
  * [MESOS-7968] - Handle `/proc/self/ns/pid_for_children` when parsing 
available namespace.
  * [MESOS-7969] - Handle cgroups v2 hierarchy when parsing /proc/self/cgroups.
  * [MESOS-7980] - Stout fails to compile with libc >= 2.26.