You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/03/11 04:15:27 UTC

[1/4] mesos git commit: Added 'delegate' info to the Help process.

Repository: mesos
Updated Branches:
  refs/heads/master 3f2e2ad60 -> 3605b5a9d


Added 'delegate' info to the Help process.

Just as the ProcessManager needs the delegate name to know which
process to service root HTTP requests from, the Help process needs to
know the delegate name so it can generate the proper USAGE strings.

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


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

Branch: refs/heads/master
Commit: 845fa6abdc163676cde225e2dc72cee9e3e964f5
Parents: 3f2e2ad
Author: Kevin Klues <kl...@gmail.com>
Authored: Thu Mar 10 19:14:18 2016 -0800
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Thu Mar 10 19:14:18 2016 -0800

----------------------------------------------------------------------
 3rdparty/libprocess/include/process/help.hpp |  5 ++++-
 3rdparty/libprocess/src/help.cpp             | 12 ++++++++++--
 3rdparty/libprocess/src/process.cpp          |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/845fa6ab/3rdparty/libprocess/include/process/help.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/help.hpp b/3rdparty/libprocess/include/process/help.hpp
index 93306ad..783304e 100644
--- a/3rdparty/libprocess/include/process/help.hpp
+++ b/3rdparty/libprocess/include/process/help.hpp
@@ -83,7 +83,7 @@ inline std::string REFERENCES(T&&... args)
 class Help : public Process<Help>
 {
 public:
-  Help();
+  Help(const Option<std::string>& delegate);
 
   // Adds 'help' for the route 'name' of the process with the
   // specified 'id' (i.e., 'http://ip:port/id/name'). It's expected
@@ -128,6 +128,9 @@ private:
   // Helper function to get usage path by process id and endpoint name.
   std::string getUsagePath(const std::string& id, const std::string& name);
 
+  // Delegate process name to receive root HTTP requests.
+  const Option<std::string> delegate;
+
   std::map<std::string, std::map<std::string, std::string>> helps;
 };
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/845fa6ab/3rdparty/libprocess/src/help.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/help.cpp b/3rdparty/libprocess/src/help.cpp
index bac980d..5f36880 100644
--- a/3rdparty/libprocess/src/help.cpp
+++ b/3rdparty/libprocess/src/help.cpp
@@ -71,7 +71,9 @@ string HELP(
 }
 
 
-Help::Help() : ProcessBase("help") {}
+Help::Help(const Option<string>& _delegate)
+  : ProcessBase("help"),
+    delegate(_delegate) {}
 
 
 string Help::getUsagePath(const string& id, const string& name)
@@ -91,7 +93,13 @@ void Help::add(
     const string path = "/" + getUsagePath(id, name);
 
     if (help.isSome()) {
-      string usage = "### USAGE ###\n" + USAGE(path) + "\n";
+      string usage = "### USAGE ###\n";
+      // If a delegate is set, we have 2 valid endpoints we could hit.
+      // /name *and* /id/name. Add it in.
+      if (delegate == id) {
+        usage += USAGE(getUsagePath("", name));
+      }
+      usage += USAGE(path) + "\n";
       helps[id][name] = usage + help.get();
     } else {
       helps[id][name] = "## No help page for `" + path + "`\n";

http://git-wip-us.apache.org/repos/asf/mesos/blob/845fa6ab/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index 04b2672..feaffa4 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -957,7 +957,7 @@ void initialize(const Option<string>& delegate)
   gc = spawn(new GarbageCollector());
 
   // Create global help process.
-  help = spawn(new Help(), true);
+  help = spawn(new Help(delegate), true);
 
   // Create the global logging process.
   spawn(new Logging(), true);


[2/4] mesos git commit: Fixed comment in support/generate-endpoint-help.py.

Posted by bm...@apache.org.
Fixed comment in support/generate-endpoint-help.py.

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


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

Branch: refs/heads/master
Commit: 9913743f75e0b81729d7979796be8a7d65c30789
Parents: 845fa6a
Author: Kevin Klues <kl...@gmail.com>
Authored: Thu Mar 10 19:14:23 2016 -0800
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Thu Mar 10 19:14:23 2016 -0800

----------------------------------------------------------------------
 support/generate-endpoint-help.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/9913743f/support/generate-endpoint-help.py
----------------------------------------------------------------------
diff --git a/support/generate-endpoint-help.py b/support/generate-endpoint-help.py
index cb60811..d42d6a9 100644
--- a/support/generate-endpoint-help.py
+++ b/support/generate-endpoint-help.py
@@ -134,7 +134,7 @@ def get_help(ip, port):
 
 
 def generalize_endpoint_id(id):
-  """Generalizes the id of the form e.g. process(id) to slave(id)."""
+  """Generalizes the id of the form e.g. process(1) to process(id)."""
   return re.sub('\([0-9]+\)', '(id)', id)
 
 


[3/4] mesos git commit: Added exception for master/slave(id) in endpoint help documentation.

Posted by bm...@apache.org.
Added exception for master/slave(id) in endpoint help documentation.

Specifically, the 'master' and 'slave(id)' processes should not
include their names in the endpoint help documentation because we
encourage usage of the shorter form.

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


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

Branch: refs/heads/master
Commit: 72084c791b0ce576941ed810db5a5f654abe12c3
Parents: 9913743
Author: Kevin Klues <kl...@gmail.com>
Authored: Thu Mar 10 19:14:30 2016 -0800
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Thu Mar 10 19:14:30 2016 -0800

----------------------------------------------------------------------
 support/generate-endpoint-help.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/72084c79/support/generate-endpoint-help.py
----------------------------------------------------------------------
diff --git a/support/generate-endpoint-help.py b/support/generate-endpoint-help.py
index d42d6a9..5d23b10 100644
--- a/support/generate-endpoint-help.py
+++ b/support/generate-endpoint-help.py
@@ -150,12 +150,22 @@ def get_endpoint_path(id, name):
                ('process(id)', '/')     -> '/process(id)'
                ('process', '/endpoint') -> '/process/endpoint'
   """
-  new_id = generalize_endpoint_id(id)
-  new_name = name[1:] # Strip the leading slash
-  if new_name:
-    return posixpath.join('/', new_id, new_name)
-  else:
-    return posixpath.join('/', new_id)
+  # Tokenize the endpoint by '/' (filtering out any empty strings between '/'s)
+  path_parts = filter(None, name.split('/'))
+
+  # Conditionally prepend the 'id' to the list of path parts.
+  # Following the notion of a 'delegate' in Mesos, we want our
+  # preferred endpoint paths for the delegate process to be
+  # '/endpoint' instead of '/process/endpoint'. Since this script only
+  # starts 1 master and 1 slave, our only delegate processes are
+  # "master" and "slave(id)". If the id matches one of these, we don't
+  # prepend it, otherwise we do.
+  id = generalize_endpoint_id(id)
+  delegates = ["master", "slave(id)"]
+  if id not in delegates:
+    path_parts = [id] + path_parts
+
+  return posixpath.join('/', *path_parts)
 
 
 def get_relative_md_path(id, name):


[4/4] mesos git commit: Updated endpoint docs based on adding the delegate to the Help process.

Posted by bm...@apache.org.
Updated endpoint docs based on adding the delegate to the Help process.

Also updated the permissions on the generate-endpoint-help.py script
to make it executable.

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


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

Branch: refs/heads/master
Commit: 3605b5a9d12bbaf57f0a1306d92fe0cd64ef81e7
Parents: 72084c7
Author: Kevin Klues <kl...@gmail.com>
Authored: Thu Mar 10 19:15:11 2016 -0800
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Thu Mar 10 19:15:11 2016 -0800

----------------------------------------------------------------------
 docs/endpoints/index.md                       | 58 +++++++++++-----------
 docs/endpoints/master/api/v1/scheduler.md     |  3 +-
 docs/endpoints/master/create-volumes.md       |  3 +-
 docs/endpoints/master/destroy-volumes.md      |  3 +-
 docs/endpoints/master/flags.md                |  3 +-
 docs/endpoints/master/frameworks.md           |  3 +-
 docs/endpoints/master/health.md               |  3 +-
 docs/endpoints/master/machine/down.md         |  3 +-
 docs/endpoints/master/machine/up.md           |  3 +-
 docs/endpoints/master/maintenance/schedule.md |  3 +-
 docs/endpoints/master/maintenance/status.md   |  3 +-
 docs/endpoints/master/observe.md              |  3 +-
 docs/endpoints/master/quota.md                |  3 +-
 docs/endpoints/master/redirect.md             |  3 +-
 docs/endpoints/master/reserve.md              |  3 +-
 docs/endpoints/master/roles.json.md           |  3 +-
 docs/endpoints/master/roles.md                |  3 +-
 docs/endpoints/master/slaves.md               |  3 +-
 docs/endpoints/master/state-summary.md        |  3 +-
 docs/endpoints/master/state.json.md           |  3 +-
 docs/endpoints/master/state.md                |  3 +-
 docs/endpoints/master/tasks.json.md           |  3 +-
 docs/endpoints/master/tasks.md                |  3 +-
 docs/endpoints/master/teardown.md             |  3 +-
 docs/endpoints/master/unreserve.md            |  3 +-
 docs/endpoints/slave/api/v1/executor.md       |  3 +-
 docs/endpoints/slave/flags.md                 |  3 +-
 docs/endpoints/slave/health.md                |  3 +-
 docs/endpoints/slave/state.json.md            |  3 +-
 docs/endpoints/slave/state.md                 |  3 +-
 30 files changed, 87 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/index.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/index.md b/docs/endpoints/index.md
index bd70819..27b178e 100644
--- a/docs/endpoints/index.md
+++ b/docs/endpoints/index.md
@@ -38,30 +38,30 @@ For example, http://master.com:5050/files/browse
 * [/logging/toggle](logging/toggle.md)
 
 ### master ###
-* [/master/api/v1/scheduler](master/api/v1/scheduler.md)
-* [/master/create-volumes](master/create-volumes.md)
-* [/master/destroy-volumes](master/destroy-volumes.md)
-* [/master/flags](master/flags.md)
-* [/master/frameworks](master/frameworks.md)
-* [/master/health](master/health.md)
-* [/master/machine/down](master/machine/down.md)
-* [/master/machine/up](master/machine/up.md)
-* [/master/maintenance/schedule](master/maintenance/schedule.md)
-* [/master/maintenance/status](master/maintenance/status.md)
-* [/master/observe](master/observe.md)
-* [/master/quota](master/quota.md)
-* [/master/redirect](master/redirect.md)
-* [/master/reserve](master/reserve.md)
-* [/master/roles](master/roles.md)
-* [/master/roles.json](master/roles.json.md)
-* [/master/slaves](master/slaves.md)
-* [/master/state](master/state.md)
-* [/master/state-summary](master/state-summary.md)
-* [/master/state.json](master/state.json.md)
-* [/master/tasks](master/tasks.md)
-* [/master/tasks.json](master/tasks.json.md)
-* [/master/teardown](master/teardown.md)
-* [/master/unreserve](master/unreserve.md)
+* [/api/v1/scheduler](master/api/v1/scheduler.md)
+* [/create-volumes](master/create-volumes.md)
+* [/destroy-volumes](master/destroy-volumes.md)
+* [/flags](master/flags.md)
+* [/frameworks](master/frameworks.md)
+* [/health](master/health.md)
+* [/machine/down](master/machine/down.md)
+* [/machine/up](master/machine/up.md)
+* [/maintenance/schedule](master/maintenance/schedule.md)
+* [/maintenance/status](master/maintenance/status.md)
+* [/observe](master/observe.md)
+* [/quota](master/quota.md)
+* [/redirect](master/redirect.md)
+* [/reserve](master/reserve.md)
+* [/roles](master/roles.md)
+* [/roles.json](master/roles.json.md)
+* [/slaves](master/slaves.md)
+* [/state](master/state.md)
+* [/state-summary](master/state-summary.md)
+* [/state.json](master/state.json.md)
+* [/tasks](master/tasks.md)
+* [/tasks.json](master/tasks.json.md)
+* [/teardown](master/teardown.md)
+* [/unreserve](master/unreserve.md)
 
 ### metrics ###
 * [/metrics/snapshot](metrics/snapshot.md)
@@ -111,11 +111,11 @@ For example, http://agent.com:5051/files/browse
 * [/profiler/stop](profiler/stop.md)
 
 ### slave(id) ###
-* [/slave(id)/api/v1/executor](slave/api/v1/executor.md)
-* [/slave(id)/flags](slave/flags.md)
-* [/slave(id)/health](slave/health.md)
-* [/slave(id)/state](slave/state.md)
-* [/slave(id)/state.json](slave/state.json.md)
+* [/api/v1/executor](slave/api/v1/executor.md)
+* [/flags](slave/flags.md)
+* [/health](slave/health.md)
+* [/state](slave/state.md)
+* [/state.json](slave/state.json.md)
 
 ### system ###
 * [/system/stats.json](system/stats.json.md)

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/api/v1/scheduler.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/api/v1/scheduler.md b/docs/endpoints/master/api/v1/scheduler.md
index 33c3101..7a75fd7 100644
--- a/docs/endpoints/master/api/v1/scheduler.md
+++ b/docs/endpoints/master/api/v1/scheduler.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/api/v1/scheduler
+title: Apache Mesos - HTTP Endpoints - /api/v1/scheduler
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /api/v1/scheduler
 >        /master/api/v1/scheduler
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/create-volumes.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/create-volumes.md b/docs/endpoints/master/create-volumes.md
index 542f555..2ab116a 100644
--- a/docs/endpoints/master/create-volumes.md
+++ b/docs/endpoints/master/create-volumes.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/create-volumes
+title: Apache Mesos - HTTP Endpoints - /create-volumes
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /create-volumes
 >        /master/create-volumes
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/destroy-volumes.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/destroy-volumes.md b/docs/endpoints/master/destroy-volumes.md
index d5d9819..88679fe 100644
--- a/docs/endpoints/master/destroy-volumes.md
+++ b/docs/endpoints/master/destroy-volumes.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/destroy-volumes
+title: Apache Mesos - HTTP Endpoints - /destroy-volumes
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /destroy-volumes
 >        /master/destroy-volumes
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/flags.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/flags.md b/docs/endpoints/master/flags.md
index 5d2680d..739d6bf 100644
--- a/docs/endpoints/master/flags.md
+++ b/docs/endpoints/master/flags.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/flags
+title: Apache Mesos - HTTP Endpoints - /flags
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /flags
 >        /master/flags
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/frameworks.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/frameworks.md b/docs/endpoints/master/frameworks.md
index 16c7dcf..95c1f0e 100644
--- a/docs/endpoints/master/frameworks.md
+++ b/docs/endpoints/master/frameworks.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/frameworks
+title: Apache Mesos - HTTP Endpoints - /frameworks
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /frameworks
 >        /master/frameworks
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/health.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/health.md b/docs/endpoints/master/health.md
index a73c64e..7f93520 100644
--- a/docs/endpoints/master/health.md
+++ b/docs/endpoints/master/health.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/health
+title: Apache Mesos - HTTP Endpoints - /health
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /health
 >        /master/health
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/machine/down.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/machine/down.md b/docs/endpoints/master/machine/down.md
index ed29235..6eec9ec 100644
--- a/docs/endpoints/master/machine/down.md
+++ b/docs/endpoints/master/machine/down.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/machine/down
+title: Apache Mesos - HTTP Endpoints - /machine/down
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /machine/down
 >        /master/machine/down
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/machine/up.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/machine/up.md b/docs/endpoints/master/machine/up.md
index 01dac5d..7cbbf04 100644
--- a/docs/endpoints/master/machine/up.md
+++ b/docs/endpoints/master/machine/up.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/machine/up
+title: Apache Mesos - HTTP Endpoints - /machine/up
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /machine/up
 >        /master/machine/up
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/maintenance/schedule.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/maintenance/schedule.md b/docs/endpoints/master/maintenance/schedule.md
index 81c34f5..2b5e782 100644
--- a/docs/endpoints/master/maintenance/schedule.md
+++ b/docs/endpoints/master/maintenance/schedule.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/maintenance/schedule
+title: Apache Mesos - HTTP Endpoints - /maintenance/schedule
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /maintenance/schedule
 >        /master/maintenance/schedule
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/maintenance/status.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/maintenance/status.md b/docs/endpoints/master/maintenance/status.md
index 6ccc534..4d0c755 100644
--- a/docs/endpoints/master/maintenance/status.md
+++ b/docs/endpoints/master/maintenance/status.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/maintenance/status
+title: Apache Mesos - HTTP Endpoints - /maintenance/status
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /maintenance/status
 >        /master/maintenance/status
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/observe.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/observe.md b/docs/endpoints/master/observe.md
index bb57fac..fae1ee0 100644
--- a/docs/endpoints/master/observe.md
+++ b/docs/endpoints/master/observe.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/observe
+title: Apache Mesos - HTTP Endpoints - /observe
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /observe
 >        /master/observe
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/quota.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/quota.md b/docs/endpoints/master/quota.md
index 7e7b30c..812874d 100644
--- a/docs/endpoints/master/quota.md
+++ b/docs/endpoints/master/quota.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/quota
+title: Apache Mesos - HTTP Endpoints - /quota
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /quota
 >        /master/quota
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/redirect.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/redirect.md b/docs/endpoints/master/redirect.md
index 65041c6..ac9d0fa 100644
--- a/docs/endpoints/master/redirect.md
+++ b/docs/endpoints/master/redirect.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/redirect
+title: Apache Mesos - HTTP Endpoints - /redirect
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /redirect
 >        /master/redirect
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/reserve.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/reserve.md b/docs/endpoints/master/reserve.md
index 3e2a857..1a4f679 100644
--- a/docs/endpoints/master/reserve.md
+++ b/docs/endpoints/master/reserve.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/reserve
+title: Apache Mesos - HTTP Endpoints - /reserve
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /reserve
 >        /master/reserve
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/roles.json.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/roles.json.md b/docs/endpoints/master/roles.json.md
index f1d703b..8637153 100644
--- a/docs/endpoints/master/roles.json.md
+++ b/docs/endpoints/master/roles.json.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/roles.json
+title: Apache Mesos - HTTP Endpoints - /roles.json
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /roles.json
 >        /master/roles.json
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/roles.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/roles.md b/docs/endpoints/master/roles.md
index 37f286e..171e016 100644
--- a/docs/endpoints/master/roles.md
+++ b/docs/endpoints/master/roles.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/roles
+title: Apache Mesos - HTTP Endpoints - /roles
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /roles
 >        /master/roles
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/slaves.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/slaves.md b/docs/endpoints/master/slaves.md
index ed3efe5..ec169c1 100644
--- a/docs/endpoints/master/slaves.md
+++ b/docs/endpoints/master/slaves.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/slaves
+title: Apache Mesos - HTTP Endpoints - /slaves
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /slaves
 >        /master/slaves
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/state-summary.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/state-summary.md b/docs/endpoints/master/state-summary.md
index 1c3d9f5..fb10ac7 100644
--- a/docs/endpoints/master/state-summary.md
+++ b/docs/endpoints/master/state-summary.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/state-summary
+title: Apache Mesos - HTTP Endpoints - /state-summary
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /state-summary
 >        /master/state-summary
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/state.json.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/state.json.md b/docs/endpoints/master/state.json.md
index 1614ae5..0415cfd 100644
--- a/docs/endpoints/master/state.json.md
+++ b/docs/endpoints/master/state.json.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/state.json
+title: Apache Mesos - HTTP Endpoints - /state.json
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /state.json
 >        /master/state.json
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/state.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/state.md b/docs/endpoints/master/state.md
index ffb3894..ae1ec71 100644
--- a/docs/endpoints/master/state.md
+++ b/docs/endpoints/master/state.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/state
+title: Apache Mesos - HTTP Endpoints - /state
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /state
 >        /master/state
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/tasks.json.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/tasks.json.md b/docs/endpoints/master/tasks.json.md
index 84183fc..46a1253 100644
--- a/docs/endpoints/master/tasks.json.md
+++ b/docs/endpoints/master/tasks.json.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/tasks.json
+title: Apache Mesos - HTTP Endpoints - /tasks.json
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /tasks.json
 >        /master/tasks.json
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/tasks.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/tasks.md b/docs/endpoints/master/tasks.md
index d85ebc8..2ada97b 100644
--- a/docs/endpoints/master/tasks.md
+++ b/docs/endpoints/master/tasks.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/tasks
+title: Apache Mesos - HTTP Endpoints - /tasks
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /tasks
 >        /master/tasks
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/teardown.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/teardown.md b/docs/endpoints/master/teardown.md
index 5d759ef..f68d083 100644
--- a/docs/endpoints/master/teardown.md
+++ b/docs/endpoints/master/teardown.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/teardown
+title: Apache Mesos - HTTP Endpoints - /teardown
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /teardown
 >        /master/teardown
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/master/unreserve.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/unreserve.md b/docs/endpoints/master/unreserve.md
index d26ae7c..e059d8d 100644
--- a/docs/endpoints/master/unreserve.md
+++ b/docs/endpoints/master/unreserve.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /master/unreserve
+title: Apache Mesos - HTTP Endpoints - /unreserve
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /unreserve
 >        /master/unreserve
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/slave/api/v1/executor.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/slave/api/v1/executor.md b/docs/endpoints/slave/api/v1/executor.md
index c4c98aa..7fa7cda 100644
--- a/docs/endpoints/slave/api/v1/executor.md
+++ b/docs/endpoints/slave/api/v1/executor.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /slave(id)/api/v1/executor
+title: Apache Mesos - HTTP Endpoints - /api/v1/executor
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /api/v1/executor
 >        /slave(1)/api/v1/executor
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/slave/flags.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/slave/flags.md b/docs/endpoints/slave/flags.md
index ffa67bd..44cbf1f 100644
--- a/docs/endpoints/slave/flags.md
+++ b/docs/endpoints/slave/flags.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /slave(id)/flags
+title: Apache Mesos - HTTP Endpoints - /flags
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /flags
 >        /slave(1)/flags
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/slave/health.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/slave/health.md b/docs/endpoints/slave/health.md
index 8ba85f4..db907e0 100644
--- a/docs/endpoints/slave/health.md
+++ b/docs/endpoints/slave/health.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /slave(id)/health
+title: Apache Mesos - HTTP Endpoints - /health
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /health
 >        /slave(1)/health
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/slave/state.json.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/slave/state.json.md b/docs/endpoints/slave/state.json.md
index 184a65f..b0bd1ad 100644
--- a/docs/endpoints/slave/state.json.md
+++ b/docs/endpoints/slave/state.json.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /slave(id)/state.json
+title: Apache Mesos - HTTP Endpoints - /state.json
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /state.json
 >        /slave(1)/state.json
 
 ### TL;DR; ###

http://git-wip-us.apache.org/repos/asf/mesos/blob/3605b5a9/docs/endpoints/slave/state.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/slave/state.md b/docs/endpoints/slave/state.md
index 5618912..3bab316 100644
--- a/docs/endpoints/slave/state.md
+++ b/docs/endpoints/slave/state.md
@@ -1,10 +1,11 @@
 ---
-title: Apache Mesos - HTTP Endpoints - /slave(id)/state
+title: Apache Mesos - HTTP Endpoints - /state
 layout: documentation
 ---
 <!--- This is an automatically generated file. DO NOT EDIT! --->
 
 ### USAGE ###
+>        /state
 >        /slave(1)/state
 
 ### TL;DR; ###