You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/08/04 16:31:39 UTC
[1/3] mesos git commit: Added MESOS-5922 and MESOS-5928 to CHANGELOG
for 1.0.1.
Repository: mesos
Updated Branches:
refs/heads/1.0.x c2e6cc649 -> 8abecbfe5
Added MESOS-5922 and MESOS-5928 to CHANGELOG for 1.0.1.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8abecbfe
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8abecbfe
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8abecbfe
Branch: refs/heads/1.0.x
Commit: 8abecbfe5d2b8dc0211fd5a9f656ea8884079efa
Parents: 6fe8978
Author: Vinod Kone <vi...@gmail.com>
Authored: Thu Aug 4 09:29:20 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Thu Aug 4 09:30:53 2016 -0700
----------------------------------------------------------------------
CHANGELOG | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8abecbfe/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index f3112db..2648282 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,14 +7,15 @@ All Issues:
* [MESOS-5388] - MesosContainerizerLaunch flags execute arbitrary commands via shell.
* [MESOS-5911] - Webui redirection to leader in browser does not work.
* [MESOS-5913] - Stale socket FD usage when using libevent + SSL.
+ * [MESOS-5922] - mesos-agent --help exit status is 1
* [MESOS-5923] - Ubuntu 14.04 LTS GPU Isolator "/run" directory is noexec.
* [MESOS-5927] - Unable to run "scratch" Dockerfiles with Unified Containerizer.
+ * [MESOS-5928] - Agent's '--version' flag doesn't work
* [MESOS-5943] - Incremental http parsing of URLs leads to decoder error.
* [MESOS-5945] - NvidiaVolume::create() should check for root before creating volume.
* [MESOS-5959] - All non-root tests fail on GPU machine.
* [MESOS-5982] - NvidiaVolume errors out if any Nvidia binary is missing.
-
Release Notes - Mesos - Version 1.0.0
--------------------------------------------
This release contains the following new features:
[3/3] mesos git commit: Mesos-slave --help should not return as
failed.
Posted by vi...@apache.org.
Mesos-slave --help should not return as failed.
Doing a simple \`mesos-agent --help\` should return with exit_status=0.
It's not the case since work_dir is considered as mandatory.
Review: https://reviews.apache.org/r/50570/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cc86e4bf
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cc86e4bf
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cc86e4bf
Branch: refs/heads/1.0.x
Commit: cc86e4bfd4eeffbd1e93ec78b92903319baf2d53
Parents: c2e6cc6
Author: Pierre Cheynier <me...@pierre-cheynier.net>
Authored: Thu Aug 4 09:26:57 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Thu Aug 4 09:30:53 2016 -0700
----------------------------------------------------------------------
src/slave/main.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/cc86e4bf/src/slave/main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/main.cpp b/src/slave/main.cpp
index a4d971a..6fb5b28 100644
--- a/src/slave/main.cpp
+++ b/src/slave/main.cpp
@@ -182,6 +182,11 @@ int main(int argc, char** argv)
Try<flags::Warnings> load = flags.load("MESOS_", argc, argv);
+ if (flags.help) {
+ cout << flags.usage() << endl;
+ return EXIT_SUCCESS;
+ }
+
// TODO(marco): this pattern too should be abstracted away
// in FlagsBase; I have seen it at least 15 times.
if (load.isError()) {
@@ -189,11 +194,6 @@ int main(int argc, char** argv)
return EXIT_FAILURE;
}
- if (flags.help) {
- cout << flags.usage() << endl;
- return EXIT_SUCCESS;
- }
-
if (flags.version) {
cout << "mesos" << " " << MESOS_VERSION << endl;
return EXIT_SUCCESS;
[2/3] mesos git commit: Moved check for '--version' in master and
agent 'main.cpp'.
Posted by vi...@apache.org.
Moved check for '--version' in master and agent 'main.cpp'.
The recent removal of the agent's default `work_dir`
requires us to check for the presence of the `--version`
flag before we check for errors in flag loading; this
patch makes that change, and also moves the
corresponding code in the master for consistency.
Review: https://reviews.apache.org/r/50609/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6fe8978c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6fe8978c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6fe8978c
Branch: refs/heads/1.0.x
Commit: 6fe8978c1ce7d29fb9f174735a3e6b8b75884763
Parents: cc86e4b
Author: Greg Mann <gr...@mesosphere.io>
Authored: Thu Aug 4 09:27:07 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Thu Aug 4 09:30:53 2016 -0700
----------------------------------------------------------------------
src/master/main.cpp | 12 ++++++------
src/slave/main.cpp | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6fe8978c/src/master/main.cpp
----------------------------------------------------------------------
diff --git a/src/master/main.cpp b/src/master/main.cpp
index e202973..ab3dbd6 100644
--- a/src/master/main.cpp
+++ b/src/master/main.cpp
@@ -202,9 +202,9 @@ int main(int argc, char** argv)
Try<flags::Warnings> load = flags.load("MESOS_", argc, argv);
- if (load.isError()) {
- cerr << flags.usage(load.error()) << endl;
- return EXIT_FAILURE;
+ if (flags.help) {
+ cout << flags.usage() << endl;
+ return EXIT_SUCCESS;
}
if (flags.version) {
@@ -212,9 +212,9 @@ int main(int argc, char** argv)
return EXIT_SUCCESS;
}
- if (flags.help) {
- cout << flags.usage() << endl;
- return EXIT_SUCCESS;
+ if (load.isError()) {
+ cerr << flags.usage(load.error()) << endl;
+ return EXIT_FAILURE;
}
if (ip_discovery_command.isSome() && ip.isSome()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/6fe8978c/src/slave/main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/main.cpp b/src/slave/main.cpp
index 6fb5b28..6bb0679 100644
--- a/src/slave/main.cpp
+++ b/src/slave/main.cpp
@@ -187,6 +187,11 @@ int main(int argc, char** argv)
return EXIT_SUCCESS;
}
+ if (flags.version) {
+ cout << "mesos" << " " << MESOS_VERSION << endl;
+ return EXIT_SUCCESS;
+ }
+
// TODO(marco): this pattern too should be abstracted away
// in FlagsBase; I have seen it at least 15 times.
if (load.isError()) {
@@ -194,11 +199,6 @@ int main(int argc, char** argv)
return EXIT_FAILURE;
}
- if (flags.version) {
- cout << "mesos" << " " << MESOS_VERSION << endl;
- return EXIT_SUCCESS;
- }
-
if (master.isNone() && flags.master_detector.isNone()) {
cerr << flags.usage("Missing required option `--master` or "
"`--master_detector`.") << endl;