You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ti...@apache.org on 2016/01/19 18:01:00 UTC

svn commit: r1725568 [2/5] - in /mesos/site: publish/ publish/documentation/ publish/documentation/allocation-module/ publish/documentation/architecture/ publish/documentation/authentication/ publish/documentation/authorization/ publish/documentation/c...

Modified: mesos/site/publish/documentation/latest/c++-style-guide/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/c%2B%2B-style-guide/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/c++-style-guide/index.html (original)
+++ mesos/site/publish/documentation/latest/c++-style-guide/index.html Tue Jan 19 17:00:59 2016
@@ -151,22 +151,9 @@ void Slave::statusUpdate(StatusUpdate up
 <ul>
 <li>End each sentence within a comment with a punctuation mark (please note that we generally prefer periods); this applies to incomplete sentences as well.</li>
 <li>For trailing comments, leave one space.</li>
-<li>Use backticks when quoting code excerpts or object/variable/function names. For example:</li>
 </ul>
 
 
-<pre><code class="{.cpp}">// Use `SchedulerDriver::acceptOffers()` to send several offer
-// operations. This makes use of the `RESERVE()` and `UNRESERVE()`
-// helpers, which take a `Resources` object as input and produce
-// appropriate offer operations. Note that we are unreserving the
-// resources contained in `dynamicallyReserved1`.
-driver.acceptOffers({offer.id()},
-    {UNRESERVE(dynamicallyReserved1),
-     RESERVE(dynamicallyReserved2),
-     RESERVE(dynamicallyReserved3)},
-    filters);
-</code></pre>
-
 <h2>Breaks</h2>
 
 <ul>
@@ -243,24 +230,9 @@ allocator-&gt;resourcesRecovered(
 <h2>Empty Lines</h2>
 
 <ul>
-<li>One empty line at the end of the file.</li>
-<li>Inside a code block, every multi-line statement should be followed by one empty line.</li>
-</ul>
-
-
-<pre><code class="{.cpp}">Try&lt;very_very_long_type&gt; long_name =
-    ::protobuf::parse&lt;very_very_long_type&gt;(
-        request);
-
-for (int i = 0; i &lt; very_very_long_expression();
-     i++) {
-  // No empty line here for control constructs.
-}
-</code></pre>
-
-<ul>
-<li>Elements outside classes (classes, structs, global functions, etc.) should be spaced apart by two empty lines.</li>
-<li>Elements inside classes (member variables and functions) should not be spaced apart by more than one empty line.</li>
+<li>1 blank line at the end of the file.</li>
+<li>Elements outside classes (classes, structs, global functions, etc.) should be spaced apart by 2 blank lines.</li>
+<li>Elements inside classes (member variables and functions) should not be spaced apart by more than 1 blank line.</li>
 </ul>
 
 
@@ -349,75 +321,43 @@ s += "world"; // THIS IS A DANGLING REFE
 <ul>
 <li><p>Mesos source files must contain the &ldquo;ASF&rdquo; header:</p>
 
-<pre><code>   // Licensed to the Apache Software Foundation (ASF) under one
-   // or more contributor license agreements.  See the NOTICE file
-   // distributed with this work for additional information
-   // regarding copyright ownership.  The ASF licenses this file
-   // to you under the Apache License, Version 2.0 (the
-   // "License"); you may not use this file except in compliance
-   // with the License.  You may obtain a copy of the License at
-   //
-   //     http://www.apache.org/licenses/LICENSE-2.0
-   //
-   // Unless required by applicable law or agreed to in writing, software
-   // distributed under the License is distributed on an "AS IS" BASIS,
-   // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   // See the License for the specific language governing permissions and
-   // limitations under the License.
+<pre><code>  /**
+   * Licensed to the Apache Software Foundation (ASF) under one
+   * or more contributor license agreements.  See the NOTICE file
+   * distributed with this work for additional information
+   * regarding copyright ownership.  The ASF licenses this file
+   * to you under the Apache License, Version 2.0 (the
+   * "License"); you may not use this file except in compliance
+   * with the License.  You may obtain a copy of the License at
+   *
+   *     http://www.apache.org/licenses/LICENSE-2.0
+   *
+   * Unless required by applicable law or agreed to in writing, software
+   * distributed under the License is distributed on an "AS IS" BASIS,
+   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   * See the License for the specific language governing permissions and
+   * limitations under the License.
+   */
 </code></pre></li>
 <li><p>Stout and libprocess source files must contain the &ldquo;Apache License Version 2.0&rdquo; header:</p>
 
-<pre><code>   // Licensed under the Apache License, Version 2.0 (the "License");
-   // you may not use this file except in compliance with the License.
-   // You may obtain a copy of the License at
-   //
-   //     http://www.apache.org/licenses/LICENSE-2.0
-   //
-   // Unless required by applicable law or agreed to in writing, software
-   // distributed under the License is distributed on an "AS IS" BASIS,
-   // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   // See the License for the specific language governing permissions and
-   // limitations under the License
+<pre><code>  /**
+   * Licensed under the Apache License, Version 2.0 (the "License");
+   * you may not use this file except in compliance with the License.
+   * You may obtain a copy of the License at
+   *
+   *     http://www.apache.org/licenses/LICENSE-2.0
+   *
+   * Unless required by applicable law or agreed to in writing, software
+   * distributed under the License is distributed on an "AS IS" BASIS,
+   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   * See the License for the specific language governing permissions and
+   * limitations under the License
+   */
 </code></pre></li>
 </ul>
 
 
-<h2>Order of includes</h2>
-
-<p>In addition to the ordering rules from the Google style guide, Mesos related headers are separated into sections. Newline to separate each section.
-Mesos related headers in <code>include</code> directories are partitioned by their subfolders, sorted alphabetically, and included using brackets.
-Header in <code>src</code> directories are included afterwards, using the same rules but with quotes instead of brackets.</p>
-
-<p>Example for <code>src/common/foo.cpp</code>:</p>
-
-<pre><code class="{.cpp}">#include "common/foo.hpp"
-
-#include &lt;stdint.h&gt;
-
-#include &lt;string&gt;
-#include &lt;vector&gt;
-
-#include &lt;boost/circular_buffer.hpp&gt;
-
-#include &lt;mesos/mesos.hpp&gt;
-#include &lt;mesos/type_utils.hpp&gt;
-
-#include &lt;mesos/module/authenticator.hpp&gt;
-
-#include &lt;mesos/scheduler/scheduler.hpp&gt;
-
-#include &lt;process/http.hpp&gt;
-#include &lt;process/protobuf.hpp&gt;
-
-#include &lt;stout/foreach.hpp&gt;
-#include &lt;stout/hashmap.hpp&gt;
-
-#include "common/build.hpp"
-#include "common/protobuf_utils.hpp"
-
-#include "master/flags.hpp"
-</code></pre>
-
 <h2>C++11</h2>
 
 <p>We support C++11 and require GCC 4.8+ or Clang 3.5+ compilers. The whitelist of supported C++11 features is:</p>

Modified: mesos/site/publish/documentation/latest/clang-format/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/clang-format/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/clang-format/index.html (original)
+++ mesos/site/publish/documentation/latest/clang-format/index.html Tue Jan 19 17:00:59 2016
@@ -85,7 +85,7 @@
 
 <p><a href="http://llvm.org/releases/3.5.1/tools/clang/docs/ClangFormat.html">ClangFormat</a> is an automatic source code formatting tool which helps us focus on the code rather than the formatting.</p>
 
-<blockquote><p>The provided configurations try to honor the <a href="/documentation/latest/c++-style-guide/">Mesos C++ Style Guide</a> as much as possible, but there are some limitations which require manual attention. Even with these limitations however, ClangFormat will be extremely useful for your workflow!</p></blockquote>
+<blockquote><p>The provided configurations try to honor the <a href="http://mesos.apache.org/documentation/latest/c++-style-guide/">Mesos C++ Style Guide</a> as much as possible, but there are some limitations which require manual attention. Even with these limitations however, ClangFormat will be extremely useful for your workflow!</p></blockquote>
 
 <h2>Setup</h2>
 

Modified: mesos/site/publish/documentation/latest/committers/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/committers/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/committers/index.html (original)
+++ mesos/site/publish/documentation/latest/committers/index.html Tue Jan 19 17:00:59 2016
@@ -231,13 +231,6 @@
       <td>nnielsen@apache.org</td>
     </tr>
     <tr>
-      <td>-5</td>
-      <td>Michael Park</td>
-      <td>Mesosphere</td>
-      <td>mpark</td>
-      <td>mpark@apache.org</td>
-    </tr>
-    <tr>
       <td>-8</td>
       <td>Charles Reiss</td>
       <td>UC Berkeley</td>

Modified: mesos/site/publish/documentation/latest/configuration/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/configuration/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/configuration/index.html (original)
+++ mesos/site/publish/documentation/latest/configuration/index.html Tue Jan 19 17:00:59 2016
@@ -83,32 +83,19 @@
 	<div class="col-md-8">
 		<h1>Mesos Configuration</h1>
 
-<p>The Mesos master and slave can take a variety of configuration options
-through command-line arguments, or environment variables. A list of
-the available options can be seen by running <code>mesos-master --help</code> or
-<code>mesos-slave --help</code>. Each option can be set in two ways:</p>
+<p>The Mesos master and slave can take a variety of configuration options through command-line arguments, or environment variables. A list of the available options can be seen by running <code>mesos-master --help</code> or <code>mesos-slave --help</code>. Each option can be set in two ways:</p>
 
 <ul>
-<li><p>By passing it to the binary using <code>--option_name=value</code>, either
-specifying the value directly, or specifying a file in which the value
-resides (<code>--option_name=file://path/to/file</code>). The path can be
-absolute or relative to the current working directory.</p></li>
-<li><p>By setting the environment variable <code>MESOS_OPTION_NAME</code> (the option
-name with a <code>MESOS_</code> prefix added to it).</p></li>
+<li>By passing it to the binary using <code>--option_name=value</code>, either specifying the value directly, or specifying a file in which the value resides (<code>--option_name=file://path/to/file</code>). The path can be absolute or relative to the current working directory.</li>
+<li>By setting the environment variable <code>MESOS_OPTION_NAME</code> (the option name with a <code>MESOS_</code> prefix added to it).</li>
 </ul>
 
 
-<p>Configuration values are searched for first in the environment, then
-on the command-line.</p>
+<p>Configuration values are searched for first in the environment, then on the command-line.</p>
 
 <p><strong>Important Options</strong></p>
 
-<p>If you have special compilation requirements, please refer to
-<code>./configure --help</code> when configuring Mesos. Additionally, this
-documentation lists only a recent snapshot of the options in Mesos. A
-definitive source for which flags your version of Mesos supports can
-be found by running the binary with the flag <code>--help</code>, for example
-<code>mesos-master --help</code>.</p>
+<p>If you have special compilation requirements, please refer to <code>./configure --help</code> when configuring Mesos. Additionally, this documentation lists only a recent snapshot of the options in Mesos. A definitive source for which flags your version of Mesos supports can be found by running the binary with the flag <code>--help</code>, for example <code>mesos-master --help</code>.</p>
 
 <h2>Master and Slave Options</h2>
 
@@ -128,26 +115,6 @@ be found by running the binary with the
 
   <tr>
     <td>
-      --advertise_ip=VALUE
-    </td>
-    <td>
-      IP address advertised to reach mesos master/slave. Mesos master/slave
-      does not bind using this IP address. However, this IP address may be
-      used to access Mesos master/slave.
-    </td>
-  </tr>
-  <tr>
-    <td>
-      --advertise_port=VALUE
-    </td>
-    <td>
-      Port advertised to reach mesos master/slave (alongwith advertise_ip).
-      Mesos master/slave does not bind using this port. However, this port
-      (alongwith advertise_ip) may be used to access Mesos master/slave.
-    </td>
-  </tr>
-  <tr>
-    <td>
       --external_log_file=VALUE
     </td>
     <td>
@@ -173,7 +140,7 @@ be found by running the binary with the
   "disabled_endpoints" : {
     "paths" : [
       "/files/browse",
-      "/slave(0)/stats.json"
+      "/slave(0)/stats.json",
     ]
   }
 }</code></pre>
@@ -290,6 +257,25 @@ be found by running the binary with the
       </th>
     </tr>
   </thead>
+   <tr>
+     <td>
+      --advertise_ip=VALUE
+    </td>
+    <td>
+      IP address advertised to reach mesos master. Mesos master does not bind using this
+      IP address. However, this IP address may be used to access Mesos master.
+    </td>
+  </tr>
+  <tr>
+    <td>
+      --advertise_port=VALUE
+    </td>
+    <td>
+      Port advertised to reach mesos master (alongwith advertise_ip). Mesos master does not
+      bind using this port. However, this port (alongwith advertise_ip) may be used to
+      access Mesos master.
+    </td>
+  </tr>
   <tr>
     <td>
       --quorum=VALUE
@@ -1299,7 +1285,6 @@ file:///path/to/file (where file contain
   </tr>
   <tr>
     <td>
-      <a name="gc_disk_headroom"></a>
       --gc_disk_headroom=VALUE
     </td>
     <td>
@@ -1363,9 +1348,7 @@ file:///path/to/file (where file contain
       'cgroups/cpu,cgroups/mem', or network/port_mapping
       (configure with flag: --with-network-isolator to enable),
       or 'external', or load an alternate isolator module using
-      the <code>--modules</code> flag. Note that this flag is only
-      relevant for the Mesos Containerizer.
-      (default: posix/cpu,posix/mem)
+      the <code>--modules</code> flag. Note that this flag is only relevant for the Mesos Containerizer. (default: posix/cpu,posix/mem)
     </td>
   </tr>
   <tr>
@@ -1670,16 +1653,9 @@ file:///path/to/file (where file contain
       --fetcher_cache_dir=VALUE
     </td>
     <td>
-      Parent directory for fetcher cache directories (one subdirectory
-      per slave). By default this directory is held inside the work
-      directory, so everything can be deleted or archived in one
-      swoop, in particular during testing. However, a typical
-      production scenario is to use a separate cache volume. First, it
-      is not meant to be backed up. Second, you want to avoid that
-      sandbox directories and the cache directory can interfere with
-      each other in unpredictable ways by occupying shared space. So
-      it is recommended to set the cache directory explicitly.
-      (default: /tmp/mesos/fetch) </td>
+      Parent directory for fetcher cache directories (one subdirectory per slave). By default this directory is held inside the work directory, so everything can be deleted or archived in one swoop, in particular during testing. However, a typical production scenario is to use a separate cache volume. First, it is not meant to be backed up. Second, you want to avoid that sandbox directories and the cache directory can interfere with each other in unpredictable ways by occupying shared space. So it is recommended to set the cache directory explicitly.
+      (default: /tmp/mesos/fetch)
+    </td>
   </tr>
   <tr>
     <td>
@@ -1747,33 +1723,6 @@ file:///path/to/file (where file contain
     </td>
   </tr>
   <tr>
-    <td>
-      --[no-]-egress_unique_flow_per_container
-    </td>
-    <td>
-      Whether to assign an individual flow for each container for the
-      egress traffic. fq_codel qdisc is used to isolate egress traffic
-      for containers. This flag is used for the 'network/port_mapping'
-      isolator. Note, fq_codel qdisc is installed at root and is not
-      removed after mesos slave exits. (default: false)
-    </td>
-  </tr>
-  <tr>
-    <td>
-      --egress_flow_classifier_parent=root/X:Y
-    </td>
-    <td>
-      When --egress_unique_flow_per_container is enabled, we need to install
-      a flow classifier (fq_codel qdisc) on egress side. This flag specifies
-      where to install it in the whole qdisc hierarchy. By default, we install
-      it at root. But, for example, if you have already installed an HTB qdisc
-      at root, you may want this to be installed in other place than root,
-      specify an HTB class ID (X:Y) as its parent. X:Y must be hexadecimal
-      numbers without "0x" prefix. Note, it is always your responsibility to
-      ensure the whole qdisc hierarchy is meaningful and correct.
-    </td>
-  </tr>
-  <tr>
     <td>
       --[no-]network_enable_socket_statistics_summary
     </td>

Modified: mesos/site/publish/documentation/latest/effective-code-reviewing/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/effective-code-reviewing/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/effective-code-reviewing/index.html (original)
+++ mesos/site/publish/documentation/latest/effective-code-reviewing/index.html Tue Jan 19 17:00:59 2016
@@ -102,7 +102,7 @@ reviews based on commits. Become familia
 change clear in the review request, so the reviewer is not left
 guessing. It is highly recommended to attach a JIRA issue with your
 review for additional context.</li>
-<li><strong>Follow the <a href="/documentation/latest/c++-style-guide/">style guide</a>
+<li><strong>Follow the <a href="http://mesos.apache.org/documentation/latest/c++-style-guide/">style guide</a>
 and the style of code around you</strong>.</li>
 <li><strong>Do a self-review of your changes before publishing</strong>: Approach it
 from the perspective of a reviewer with no context. Is it easy to figure

Modified: mesos/site/publish/documentation/latest/fetcher/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/fetcher/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/fetcher/index.html (original)
+++ mesos/site/publish/documentation/latest/fetcher/index.html Tue Jan 19 17:00:59 2016
@@ -90,11 +90,10 @@ from local file systems.</p>
 
 <h2>What is the Mesos fetcher?</h2>
 
-<p>The Mesos fetcher is a mechanism to download resources into the <a href="/documentation/latest/sandbox/">sandbox
-directory</a> of a task in preparation of running
-the task. As part of a TaskInfo message, the framework ordering the task&rsquo;s
-execution provides a list of <code>CommandInfo::URI</code> protobuf values, which becomes
-the input to the Mesos fetcher.</p>
+<p>The Mesos fetcher is a mechanism to download resources into the sandbox
+directory of a task in preparation of running the task. As part of a TaskInfo
+message, the framework ordering the task&rsquo;s execution provides a list of
+<code>CommandInfo::URI</code> protobuf values, which becomes the input to the Mesos fetcher.</p>
 
 <p>The Mesos fetcher can copy files from a local filesytem and it also natively
 supports the HTTP, HTTPS, FTP and FTPS protocols. If the requested URI is based

Modified: mesos/site/publish/documentation/latest/getting-started/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/getting-started/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/getting-started/index.html (original)
+++ mesos/site/publish/documentation/latest/getting-started/index.html Tue Jan 19 17:00:59 2016
@@ -87,18 +87,18 @@
 
 <p>There are different ways you can get Mesos:</p>
 
-<p>1. Download the latest stable release from <a href="http://mesos.apache.org/downloads/">Apache</a> (<strong><em>Recommended</em></strong>)</p>
+<ol>
+<li><p>Download the latest stable release from <a href="http://mesos.apache.org/downloads/">Apache</a> (<strong><em>Recommended</em></strong>)</p>
 
-<pre><code>$ wget http://www.apache.org/dist/mesos/0.26.0/mesos-0.26.0.tar.gz
-$ tar -zxf mesos-0.26.0.tar.gz
-</code></pre>
-
-<p>2. Clone the Mesos git <a href="https://git-wip-us.apache.org/repos/asf/mesos.git">repository</a> (<strong><em>Advanced Users Only</em></strong>)</p>
-
-<pre><code>$ git clone https://git-wip-us.apache.org/repos/asf/mesos.git
-</code></pre>
+<pre><code> $ wget http://www.apache.org/dist/mesos/0.24.0/mesos-0.24.0.tar.gz
+ $ tar -zxf mesos-0.24.0.tar.gz
+</code></pre></li>
+<li><p>Clone the Mesos git <a href="https://git-wip-us.apache.org/repos/asf/mesos.git">repository</a> (<strong><em>Advanced Users Only</em></strong>)</p>
+
+<pre><code> $ git clone https://git-wip-us.apache.org/repos/asf/mesos.git
+</code></pre></li>
+</ol>
 
-<p><em>NOTE: If you have problems running the above commands, you may need to first run through the </em><strong>System Requirements</strong><em> section below to install the <code>wget</code>, <code>tar</code>, and <code>git</code> utilities for your system.</em></p>
 
 <h2>System Requirements</h2>
 
@@ -112,190 +112,165 @@ $ tar -zxf mesos-0.26.0.tar.gz
 
 <p>Following are the instructions for stock Ubuntu 14.04. If you are using a different OS, please install the packages accordingly.</p>
 
-<pre><code># Update the packages.
-$ sudo apt-get update
-
-# Install a few utility tools.
-$ sudo apt-get install -y tar wget git
+<pre><code>    # Update the packages.
+    $ sudo apt-get update
 
-# Install the latest OpenJDK.
-$ sudo apt-get install -y openjdk-7-jdk
+    # Install the latest OpenJDK.
+    $ sudo apt-get install -y openjdk-7-jdk
 
-# Install autotools (Only necessary if building from git repository).
-$ sudo apt-get install -y autoconf libtool
+    # Install autotools (Only necessary if building from git repository).
+    $ sudo apt-get install -y autoconf libtool
 
-# Install other Mesos dependencies.
-$ sudo apt-get -y install build-essential python-dev python-boto libcurl4-nss-dev libsasl2-dev libsasl2-modules maven libapr1-dev libsvn-dev
+    # Install other Mesos dependencies.
+    $ sudo apt-get -y install build-essential python-dev python-boto libcurl4-nss-dev libsasl2-dev maven libapr1-dev libsvn-dev
 </code></pre>
 
-<h3>Mac OS X Yosemite &amp; El Capitan</h3>
+<h3>Mac OS X Yosemite</h3>
 
-<p>Following are the instructions for stock Mac OS X Yosemite and El Capitan. If you are using a different OS, please install the packages accordingly.</p>
+<p>Following are the instructions for stock Mac OS X Yosemite. If you are using a different OS, please install the packages accordingly.</p>
 
-<pre><code># Install Command Line Tools.
-$ xcode-select --install
+<pre><code>    # Install Command Line Tools.
+    $ xcode-select --install
 
-# Install Homebrew.
-$ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+    # Install Homebrew.
+    $ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 
-# Install libraries.
-$ brew install wget git autoconf automake libtool subversion maven
+    # Install libraries.
+    $ brew install autoconf automake libtool subversion maven
 </code></pre>
 
-<p><em>NOTE: When upgrading from Yosemite to El Capitan, make sure to rerun <code>xcode-select --install</code> after the upgrade.</em></p>
-
 <h3>CentOS 6.6</h3>
 
 <p>Following are the instructions for stock CentOS 6.6. If you are using a different OS, please install the packages accordingly.</p>
 
-<pre><code># Install a recent kernel for full support of process isolation.
-$ sudo rpm --import https://www.elrepo.org/RPM-GPG-KEY-elrepo.org
-$ sudo rpm -Uvh http://www.elrepo.org/elrepo-release-6-6.el6.elrepo.noarch.rpm
-$ sudo yum --enablerepo=elrepo-kernel install -y kernel-lt
-
-# Make the just installed kernel the one booted by default, and reboot.
-$ sudo sed -i 's/default=1/default=0/g' /boot/grub/grub.conf
-$ sudo reboot
-
-# Install a few utility tools. This also forces an update of `nss`,
-# which is necessary for the Java bindings to build properly.
-$ sudo yum install -y tar wget git which nss
-
-# 'Mesos &gt; 0.21.0' requires a C++ compiler with full C++11 support,
-# (e.g. GCC &gt; 4.8) which is available via 'devtoolset-2'.
-# Fetch the Scientific Linux CERN devtoolset repo file.
-$ sudo wget -O /etc/yum.repos.d/slc6-devtoolset.repo http://linuxsoft.cern.ch/cern/devtoolset/slc6-devtoolset.repo
-
-# Import the CERN GPG key.
-$ sudo rpm --import http://linuxsoft.cern.ch/cern/centos/7/os/x86_64/RPM-GPG-KEY-cern
-
-# Fetch the Apache Maven repo file.
-$ sudo wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo
-
-# 'Mesos &gt; 0.21.0' requires 'subversion &gt; 1.8' devel package, which is
-# not available in the default repositories.
-# Create a WANdisco SVN repo file to install the correct version:
-$ sudo cat &gt; /etc/yum.repos.d/wandisco-svn.repo &lt;&lt;EOF
-[WANdiscoSVN]
-name=WANdisco SVN Repo 1.8
-enabled=1
-baseurl=http://opensource.wandisco.com/centos/6/svn-1.8/RPMS/$basearch/
-gpgcheck=1
-gpgkey=http://opensource.wandisco.com/RPM-GPG-KEY-WANdisco
-EOF
-
-# Install essential development tools.
-$ sudo yum groupinstall -y "Development Tools"
-
-# Install 'devtoolset-2-toolchain' which includes GCC 4.8.2 and related packages.
-$ sudo yum install -y devtoolset-2-toolchain
-
-# Install other Mesos dependencies.
-$ sudo yum install -y apache-maven python-devel java-1.7.0-openjdk-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-util-devel
-
-# Enter a shell with 'devtoolset-2' enabled.
-$ scl enable devtoolset-2 bash
-$ g++ --version  # Make sure you've got GCC &gt; 4.8!
+<pre><code>    # Install a recent kernel for full support of process isolation.
+    $ sudo rpm --import https://www.elrepo.org/RPM-GPG-KEY-elrepo.org
+    $ sudo rpm -Uvh http://www.elrepo.org/elrepo-release-6-6.el6.elrepo.noarch.rpm
+    $ sudo yum --enablerepo=elrepo-kernel install -y kernel-lt
+
+    # Make the just installed kernel the one booted by default, and reboot.
+    $ sudo sed -i 's/default=1/default=0/g' /boot/grub/grub.conf
+    $ sudo reboot
+
+    # Install a few utility tools. This also forces an update of `nss`,
+    # which is necessary for the Java bindings to build properly.
+    $ sudo yum install -y tar wget which nss
+
+    # 'Mesos &gt; 0.21.0' requires a C++ compiler with full C++11 support,
+    # (e.g. GCC &gt; 4.8) which is available via 'devtoolset-2'.
+    # Fetch the Scientific Linux CERN devtoolset repo file.
+    $ sudo wget -O /etc/yum.repos.d/slc6-devtoolset.repo http://linuxsoft.cern.ch/cern/devtoolset/slc6-devtoolset.repo
+
+    # Import the CERN GPG key.
+    $ sudo rpm --import http://linuxsoft.cern.ch/cern/centos/7/os/x86_64/RPM-GPG-KEY-cern
+
+    # Fetch the Apache Maven repo file.
+    $ sudo wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo
+
+    # 'Mesos &gt; 0.21.0' requires 'subversion &gt; 1.8' devel package, which is
+    # not available in the default repositories.
+    # Add the WANdisco SVN repo file: '/etc/yum.repos.d/wandisco-svn.repo' with content:
+
+      [WANdiscoSVN]
+      name=WANdisco SVN Repo 1.8
+      enabled=1
+      baseurl=http://opensource.wandisco.com/centos/6/svn-1.8/RPMS/$basearch/
+      gpgcheck=1
+      gpgkey=http://opensource.wandisco.com/RPM-GPG-KEY-WANdisco
+
+    # Install essential development tools.
+    $ sudo yum groupinstall -y "Development Tools"
+
+    # Install 'devtoolset-2-toolchain' which includes GCC 4.8.2 and related packages.
+    $ sudo yum install -y devtoolset-2-toolchain
+
+    # Install other Mesos dependencies.
+    $ sudo yum install -y apache-maven python-devel java-1.7.0-openjdk-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-util-devel
+
+    # Enter a shell with 'devtoolset-2' enabled.
+    $ scl enable devtoolset-2 bash
+    $ g++ --version  # Make sure you've got GCC &gt; 4.8!
 </code></pre>
 
 <h3>CentOS 7.1</h3>
 
 <p>Following are the instructions for stock CentOS 7.1. If you are using a different OS, please install the packages accordingly.</p>
 
-<pre><code># Install a few utility tools
-$ sudo yum install -y tar wget git
+<pre><code>    # Install a few utility tools
+    $ sudo yum install -y tar wget
 
-# Fetch the Apache Maven repo file.
-$ sudo wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo
+    # Fetch the Apache Maven repo file.
+    $ sudo wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo
 
-# Install the EPEL repo so that we can pull in 'libserf-1' as part of our
-# subversion install below.
-$ sudo yum install -y epel-release
-
-# 'Mesos &gt; 0.21.0' requires 'subversion &gt; 1.8' devel package,
-# which is not available in the default repositories.
-# Create a WANdisco SVN repo file to install the correct version:
-$ sudo cat &gt; /etc/yum.repos.d/wandisco-svn.repo &lt;&lt;EOF
-[WANdiscoSVN]
-name=WANdisco SVN Repo 1.9
-enabled=1
-baseurl=http://opensource.wandisco.com/centos/7/svn-1.9/RPMS/$basearch/
-gpgcheck=1
-gpgkey=http://opensource.wandisco.com/RPM-GPG-KEY-WANdisco
-EOF
-
-# Parts of Mesos require systemd in order to operate. However, Mesos
-# only supports versions of systemd that contain the 'Delegate' flag.
-# This flag was first introduced in 'systemd version 218', which is
-# lower than the default version installed by centos. Luckily, centos
-# 7.1 has a patched 'systemd &lt; 218' that contains the 'Delegate' flag.
-# Explicity update systemd to this patched version.
-$ sudo yum update systemd
+    # 'Mesos &gt; 0.21.0' requires 'subversion &gt; 1.8' devel package, which is
+    # not available in the default repositories.
+    # Add the WANdisco SVN repo file: '/etc/yum.repos.d/wandisco-svn.repo' with content:
+
+      [WANdiscoSVN]
+      name=WANdisco SVN Repo 1.9
+      enabled=1
+      baseurl=http://opensource.wandisco.com/centos/7/svn-1.9/RPMS/$basearch/
+      gpgcheck=1
+      gpgkey=http://opensource.wandisco.com/RPM-GPG-KEY-WANdisco
 
-# Install essential development tools.
-$ sudo yum groupinstall -y "Development Tools"
+    # Install essential development tools.
+    $ sudo yum groupinstall -y "Development Tools"
 
-# Install other Mesos dependencies.
-$ sudo yum install -y apache-maven python-devel java-1.8.0-openjdk-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-util-devel
+    # Install other Mesos dependencies.
+    $ sudo yum install -y apache-maven python-devel java-1.7.0-openjdk-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-util-devel
 </code></pre>
 
 <h2>Building Mesos</h2>
 
-<pre><code># Change working directory.
-$ cd mesos
+<pre><code>    # Change working directory.
+    $ cd mesos
 
-# Bootstrap (Only required if building from git repository).
-$ ./bootstrap
+    # Bootstrap (Only required if building from git repository).
+    $ ./bootstrap
 
-# Configure and build.
-$ mkdir build
-$ cd build
-$ ../configure
-$ make
+    # Configure and build.
+    $ mkdir build
+    $ cd build
+    $ ../configure
+    $ make
 </code></pre>
 
 <p>In order to speed up the build and reduce verbosity of the logs, you can append <code>-j &lt;number of cores&gt; V=0</code> to <code>make</code>.</p>
 
-<pre><code># Run test suite.
-$ make check
+<pre><code>    # Run test suite.
+    $ make check
 
-# Install (Optional).
-$ make install
+    # Install (Optional).
+    $ make install
 </code></pre>
 
 <h2>Examples</h2>
 
-<p>Mesos comes bundled with example frameworks written in C++, Java and Python.
-The framework binaries will only be available after running <code>make check</code>, as
-described in the <strong><em>Building Mesos</em></strong> section above.</p>
+<p>Mesos comes bundled with example frameworks written in C++, Java and Python.</p>
 
-<pre><code># Change into build directory.
-$ cd build
+<pre><code>    # Change into build directory.
+    $ cd build
 
-# Start mesos master (Ensure work directory exists and has proper permissions).
-$ ./bin/mesos-master.sh --ip=127.0.0.1 --work_dir=/var/lib/mesos
+    # Start mesos master (Ensure work directory exists and has proper permissions).
+    $ ./bin/mesos-master.sh --ip=127.0.0.1 --work_dir=/var/lib/mesos
 
-# Start mesos slave.
-$ ./bin/mesos-slave.sh --master=127.0.0.1:5050
+    # Start mesos slave.
+    $ ./bin/mesos-slave.sh --master=127.0.0.1:5050
 
-# Visit the mesos web page.
-$ http://127.0.0.1:5050
+    # Visit the mesos web page.
+    $ http://127.0.0.1:5050
 
-# Run C++ framework (Exits after successfully running some tasks.).
-$ ./src/test-framework --master=127.0.0.1:5050
+    # Run C++ framework (Exits after successfully running some tasks.).
+    $ ./src/test-framework --master=127.0.0.1:5050
 
-# Run Java framework (Exits after successfully running some tasks.).
-$ ./src/examples/java/test-framework 127.0.0.1:5050
+    # Run Java framework (Exits after successfully running some tasks.).
+    $ ./src/examples/java/test-framework 127.0.0.1:5050
 
-# Run Python framework (Exits after successfully running some tasks.).
-$ ./src/examples/python/test-framework 127.0.0.1:5050
+    # Run Python framework (Exits after successfully running some tasks.).
+    $ ./src/examples/python/test-framework 127.0.0.1:5050
 </code></pre>
 
-<p><em>Note: These examples assume you are running Mesos on your local machine.
-Following them will not allow you to access the Mesos web page in a production
-environment (e.g. on AWS). For that you will need to specify the actual IP of
-your host when launching the Mesos master and ensure your firewall settings
-allow access to port 5050 from the outside world.</em></p>
+<p><em>NOTE: To build the example frameworks, make sure you build the test suite by doing <code>make check</code>.</em></p>
 
 	</div>
 </div>

Modified: mesos/site/publish/documentation/latest/high-availability/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/high-availability/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/high-availability/index.html (original)
+++ mesos/site/publish/documentation/latest/high-availability/index.html Tue Jan 19 17:00:59 2016
@@ -81,7 +81,7 @@
 		<p>See our <a href="/community/">community</a> page for more details.</p>
 	</div>
 	<div class="col-md-8">
-		<h1>Mesos High-Availability Mode</h1>
+		<h1>Mesos High Availability Mode</h1>
 
 <p>If the Mesos master is unavailable, existing tasks can continue to execute, but new resources cannot be allocated and new tasks cannot be launched. To reduce the chance of this situation occurring, Mesos has a high-availability mode that uses multiple Mesos masters: one active master (called the <em>leader</em> or leading master) and several <em>backups</em> in case it fails. The masters elect the leader, with <a href="http://zookeeper.apache.org/">Apache ZooKeeper</a> both coordinating the election and handling leader detection by masters, slaves, and scheduler drivers. More information regarding <a href="http://zookeeper.apache.org/doc/trunk/recipes.html#sc_leaderElection">how leader election works</a> is available on the Apache Zookeeper website.</p>
 
@@ -98,7 +98,7 @@
 <ul>
 <li><p>Start the mesos-master binaries using the <code>--zk</code> flag, e.g. <code>--zk=zk://host1:port1,host2:port2,.../path</code></p></li>
 <li><p>Start the mesos-slave binaries with <code>--master=zk://host1:port1,host2:port2,.../path</code></p></li>
-<li><p>Start any framework schedulers using the same <code>zk</code> path as in the last two steps. The SchedulerDriver must be constructed with this path, as shown in the <a href="/documentation/latest/app-framework-development-guide/">Framework Development Guide</a>.</p></li>
+<li><p>Start any framework schedulers using the same <code>zk</code> path as in the last two steps. The SchedulerDriver must be constructed with this path, as shown in the <a href="http://mesos.apache.org/documentation/latest/app-framework-development-guide/">Framework Development Guide</a>.</p></li>
 </ul>
 </li>
 </ol>
@@ -106,7 +106,7 @@
 
 <p>From now on, the Mesos masters and slaves all communicate with ZooKeeper to find out which master is the current leading master. This is in addition to the usual communication between the leading master and the slaves.</p>
 
-<p>Refer to the <a href="/documentation/latest/app-framework-development-guide/">Scheduler API</a> for how to deal with leadership changes.</p>
+<p>Refer to the <a href="http://mesos.apache.org/documentation/latest/app-framework-development-guide/">Scheduler API</a> for how to deal with leadership changes.</p>
 
 <h2>Component Disconnection Handling</h2>
 
@@ -134,7 +134,7 @@
 
 <ul>
 <li><p>The slave fails health checks from the leader.</p></li>
-<li><p>The leader marks the slave as deactivated and sends its tasks to the LOST state. The  <a href="/documentation/latest/app-framework-development-guide/">Framework Development Guide</a> describes these various task states.</p></li>
+<li><p>The leader marks the slave as deactivated and sends its tasks to the LOST state. The  <a href="http://mesos.apache.org/documentation/latest/app-framework-development-guide/">Framework Development Guide</a> describes these various task states.</p></li>
 <li><p>Deactivated slaves may not re-register with the leader and are told to shut down upon any post-deactivation communication.</p></li>
 </ul>
 

Modified: mesos/site/publish/documentation/latest/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/index.html (original)
+++ mesos/site/publish/documentation/latest/index.html Tue Jan 19 17:00:59 2016
@@ -95,9 +95,7 @@
 
 <ul>
 <li><a href="/documentation/latest/getting-started/">Getting Started</a> for basic instructions on compiling and installing Mesos.</li>
-<li><a href="/documentation/latest/upgrades/">Upgrades</a> for upgrading a Mesos cluster.</li>
 <li><a href="/documentation/latest/configuration/">Configuration</a> for command-line arguments.</li>
-<li><a href="/documentation/latest/containerizer-internals">Containerizer Internals</a> for implementation details of containerizers.</li>
 <li><a href="/documentation/latest/containerizer/">Mesos Containerizer</a> default containerizer, supports both Linux and POSIX systems.</li>
 <li><a href="/documentation/latest/docker-containerizer/">Docker Containerizer</a> for launching a Docker image as a Task, or as an Executor.</li>
 <li><a href="/documentation/latest/external-containerizer/">External Containerizer</a> for custom containerization implementations.</li>
@@ -114,7 +112,6 @@
 <li><a href="/documentation/latest/maintenance/">Maintenance</a> for performing maintenance on a Mesos cluster.</li>
 <li><a href="/documentation/latest/tools/">Tools</a> for setting up and running a Mesos cluster.</li>
 <li><a href="/documentation/latest/ssl/">SSL</a> for enabling and enforcing SSL communication.</li>
-<li><a href="/documentation/latest/mesos-provisioner/">Mesos Image Provisioner</a> for provisioning container filesystems from different image formats.</li>
 </ul>
 
 
@@ -126,7 +123,7 @@
 <li><a href="/documentation/latest/networking-for-mesos-managed-containers/">Networking for Mesos-managed Containers</a></li>
 <li><a href="/documentation/latest/oversubscription/">Oversubscription</a> for how to configure Mesos to take advantage of unused resources to launch &ldquo;best-effort&rdquo; tasks.</li>
 <li><a href="/documentation/latest/persistent-volume/">Persistent Volume</a> for how to allow tasks to access persistent storage resources.</li>
-<li><a href="/documentation/latest/reservation/">Reservation</a> for how operators and frameworks can reserve resources for use by a role.</li>
+<li><a href="/documentation/latest/reservation/">Reservation</a> for how to configure Mesos to allow slaves to reserve resources.</li>
 </ul>
 
 
@@ -134,7 +131,6 @@
 
 <ul>
 <li><a href="/documentation/latest/frameworks/">Mesos frameworks</a> for a list of apps built on top of Mesos and instructions on how to run them.</li>
-<li><a href="/documentation/latest/sandbox/">Sandbox</a> describes a useful debugging arena for most users.</li>
 </ul>
 
 

Modified: mesos/site/publish/documentation/latest/maintenance/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/maintenance/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/maintenance/index.html (original)
+++ mesos/site/publish/documentation/latest/maintenance/index.html Tue Jan 19 17:00:59 2016
@@ -99,7 +99,7 @@ For example:</p>
 in order to meet Service Level Agreements or to ensure uninterrupted services
 for their end users.  Therefore, to reconcile the requirements of frameworks
 and operators, frameworks must be aware of planned maintenance events and
-operators must be aware of frameworks' ability to adapt to maintenance.
+operators must be aware of frameworks’ ability to adapt to maintenance.
 Maintenance primitives add a layer to facilitate communication between the
 frameworks and operator.</p>
 

Modified: mesos/site/publish/documentation/latest/networking-for-mesos-managed-containers/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/networking-for-mesos-managed-containers/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/networking-for-mesos-managed-containers/index.html (original)
+++ mesos/site/publish/documentation/latest/networking-for-mesos-managed-containers/index.html Tue Jan 19 17:00:59 2016
@@ -280,33 +280,33 @@ message in TaskInfo. Here are a few exam
 command executor</p>
 
 <pre><code>TaskInfo {
-  ...
-  command: ...,
-  container: ContainerInfo {
-    network_infos: [
-      NetworkInfo {
+  ...
+  command: ...,
+  container: ContainerInfo {
+    network_infos: [
+      NetworkInfo {
         ip_addresses: [
           IPAddress {
-            protocol: None;
-            ip_address: None;
+            protocol: None;
+            ip_address: None;
           }
         ]
-        groups: [];
-        labels: None;
-      }
-    ]
-  }
+        groups: [];
+        labels: None;
+      }
+    ]
+  }
 }
 </code></pre></li>
 <li><p>A request for one IPv4 and one IPv6 address, in two groups using the
 default command executor</p>
 
 <pre><code>TaskInfo {
-  ...
-  command: ...,
-  container: ContainerInfo {
-    network_infos: [
-      NetworkInfo {
+  ...
+  command: ...,
+  container: ContainerInfo {
+    network_infos: [
+      NetworkInfo {
         ip_addresses: [
           IPAddress {
             protocol: IPv4;
@@ -317,43 +317,43 @@ default command executor</p>
             ip_address: None;
           }
         ]
-        groups: ["dev", "test"];
-        labels: None;
-      }
-    ]
-  }
+        groups: ["dev", "test"];
+        labels: None;
+      }
+    ]
+  }
 }
 </code></pre></li>
 <li><p>A request for two network interfaces, each with one IP address, each in
 a different network group using the default command executor</p>
 
 <pre><code>TaskInfo {
-  ...
-  command: ...,
-  container: ContainerInfo {
-    network_infos: [
-      NetworkInfo {
+  ...
+  command: ...,
+  container: ContainerInfo {
+    network_infos: [
+      NetworkInfo {
         ip_addresses: [
           IPAddress {
             protocol: None;
             ip_address: None;
           }
         ]
-        groups: ["foo"];
-        labels: None;
-      },
-      NetworkInfo {
+        groups: ["foo"];
+        labels: None;
+      },
+      NetworkInfo {
         ip_addresses: [
           IPAddress {
             protocol: None;
             ip_address: None;
           }
         ]
-        groups: ["bar"];
-        labels: None;
-      },
-    ]
-  }
+        groups: ["bar"];
+        labels: None;
+      },
+    ]
+  }
 }
 </code></pre></li>
 <li><p>A request for a specific IP address using a custom executor</p>
@@ -389,8 +389,8 @@ using the Mesos Containerizer, set TaskI
 <h2>Address Discovery</h2>
 
 <p>The NetworkInfo message allows frameworks to request IP address(es) to be
-assigned at task launch time on the Mesos agent. After opting in to network
-isolation for a given executor&rsquo;s container in this way, frameworks will need to
+assigned at task launch time on the Mesos agent.  After opting in to network
+isolation for a given executor’s container in this way, frameworks will need to
 know what address(es) were ultimately assigned in order to perform health
 checks, or any other out-of-band communication.</p>
 

Modified: mesos/site/publish/documentation/latest/oversubscription/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/oversubscription/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/oversubscription/index.html (original)
+++ mesos/site/publish/documentation/latest/oversubscription/index.html Tue Jan 19 17:00:59 2016
@@ -285,16 +285,6 @@ Controller with it&rsquo;s own libproces
 be made. Each corrective action contains information about executor or task and
 the type of action to perform.</p>
 
-<p>Mesos comes with a <code>noop</code> and a <code>load</code> qos controller. The <code>noop</code> controller
-does not provide any corrections, thus does not assure any quality of service
-for regular tasks. The <code>load</code> controller is ensuring the total system load
-doesn&rsquo;t exceed a configurable thresholds and as a result try to avoid the cpu
-congestion on the node. If the load is above the thresholds controller evicts
-all the revocable executors. These thresholds are configurable via two module
-parameters <code>load_threshold_5min</code> and <code>load_threshold_15min</code>. They represent
-standard unix load averages in the system. 1 minute system load is ignored,
-since for oversubscription use case it can be a misleading signal.</p>
-
 <pre><code class="{.proto}">message QoSCorrection {
   enum Type {
     KILL = 1; // Terminate an executor.
@@ -390,37 +380,6 @@ between these corrections is controlled
 <p>In the example above, a fixed amount of 14 cpus will be offered as revocable
 resources.</p>
 
-<p>The <code>load</code> qos controller is enabled as follows:</p>
-
-<pre><code>--qos_controller="org_apache_mesos_LoadQoSController"
-
---qos_correction_interval_min="20secs"
-
---modules='{
-  "libraries": {
-    "file": "/usr/local/lib64/libload_qos_controller.so",
-    "modules": {
-      "name": "org_apache_mesos_LoadQoSController",
-      "parameters": [
-        {
-          "key": "load_threshold_5min",
-          "value": "6"
-        },
-        {
-      "key": "load_threshold_15min",
-      "value": "4"
-        }
-      ]
-    }
-  }
-}'
-</code></pre>
-
-<p>In the example above, when standard unix system load average for 5 minutes will
-be above 6, or for 15 minutes will be above 4 then slave will evict all the
-<code>revocable</code> executors. <code>LoadQoSController</code> will be effectively run every 20
-seconds.</p>
-
 <p>To install a custom resource estimator and QoS controller, please refer to the
 <a href="/documentation/latest/modules/">modules documentation</a>.</p>
 

Modified: mesos/site/publish/documentation/latest/persistent-volume/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/persistent-volume/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/persistent-volume/index.html (original)
+++ mesos/site/publish/documentation/latest/persistent-volume/index.html Tue Jan 19 17:00:59 2016
@@ -96,10 +96,10 @@ that is mounted at a well-known location
 
 <p>Persistent volumes can only be created from <strong>reserved</strong> disk resources, whether
 it be statically reserved or dynamically reserved. A dynamically reserved
-persistent volume also cannot be unreserved without first explicitly destroying
-the volume. These rules exist to limit accidental mistakes, such as a persistent
-volume containing sensitive data being offered to other frameworks in the
-cluster.</p>
+persistent volume also cannot be unreserved without having explicitly destroyed
+the volume. These rules exist to limit the accidental mistakes such as:
+a persistent volume containing sensitive data being offered to other frameworks
+in the cluster.</p>
 
 <p>Please refer to the <a href="/documentation/latest/reservation/">Reservation</a> documentation for details
 regarding reservation mechanisms available in Mesos.</p>
@@ -113,20 +113,18 @@ specified via the existing ACL mechanism
 <li><code>Offer::Operation::Create</code> and <code>Offer::Operation::Destroy</code> messages are
 available for <strong>frameworks</strong> to send back via the <code>acceptOffers</code> API as a
 response to a resource offer.</li>
-<li><code>/create-volumes</code> and <code>/destroy-volumes</code> HTTP endpoints allow
-<strong>operators</strong> to manage persistent volumes through the master.</li>
+<li><code>/create</code> and <code>/destroy</code> HTTP endpoints are available for <strong>operators</strong>
+to manage persistent volumes through the master. (<strong><em>Coming Soon</em></strong>).</li>
 </ul>
 
 
 <p>In the following sections, we will walk through examples of each of the
 interfaces described above.</p>
 
-<h3>Framework Scheduler API</h3>
+<h2><code>Offer::Operation::Create</code></h2>
 
-<h4><code>Offer::Operation::Create</code></h4>
-
-<p>A framework can create volumes through the resource offer cycle.  Suppose we
-receive a resource offer with 2048 MB of dynamically reserved disk.</p>
+<p>A framework is able to create volumes through the resource offer cycle.
+Suppose we receive a resource offer with 2048 MB of dynamically reserved disk.</p>
 
 <pre><code>{
   "id" : &lt;offer_id&gt;,
@@ -148,12 +146,12 @@ receive a resource offer with 2048 MB of
 </code></pre>
 
 <p>We can create a persistent volume from the 2048 MB of disk resources by sending
-an <code>Offer::Operation</code> message via the <code>acceptOffers</code> API.
-<code>Offer::Operation::Create</code> has a <code>volumes</code> field which specifies the persistent
-volume information. We need to specify the following:</p>
+the following <code>Offer::Operation</code> message via the <code>acceptOffers</code> API.
+<code>Offer::Operation::Create</code> has a <code>volumes</code> field which we specify with the
+persistent volume information. We need to specify the following:</p>
 
 <ol>
-<li>The ID for the persistent volume; this must be unique per role on each slave.</li>
+<li>ID of the persistent volume which needs to be unique per role on each slave.</li>
 <li>The non-nested relative path within the container to mount the volume.</li>
 <li>The permissions for the volume. Currently, <code>"RW"</code> is the only possible value.</li>
 </ol>
@@ -186,8 +184,7 @@ volume information. We need to specify t
 }
 </code></pre>
 
-<p>If this succeeds, a subsequent resource offer will contain the following
-persistent volume:</p>
+<p>The subsequent resource offer will <strong>contain</strong> the following persistent volume:</p>
 
 <pre><code>{
   "id" : &lt;offer_id&gt;,
@@ -217,12 +214,12 @@ persistent volume:</p>
 }
 </code></pre>
 
-<h4><code>Offer::Operation::Destroy</code></h4>
+<h2><code>Offer::Operation::Destroy</code></h2>
 
-<p>A framework can destroy persistent volumes through the resource offer cycle. In
-<a href="#offeroperationcreate">Offer::Operation::Create</a>, we created a persistent
-volume from 2048 MB of disk resources. Mesos will not garbage-collect this
-volume until we explicitly destroy it. Suppose we would like to destroy the
+<p>A framework is able to destroy persistent volumes through the resource offer
+cycle. In <a href="#offeroperationcreate">Offer::Operation::Create</a>, we created a
+persistent volume from 2048 MB of disk resources. Mesos will not garbage-collect
+this volume until we explicitly destroy it. Suppose we would like to destroy the
 volume we created. First, we receive a resource offer (copy/pasted from above):</p>
 
 <pre><code>{
@@ -255,7 +252,7 @@ volume we created. First, we receive a r
 
 <p>We destroy the persistent volume by sending the <code>Offer::Operation</code> message via
 the <code>acceptOffers</code> API. <code>Offer::Operation::Destroy</code> has a <code>volumes</code> field which
-specifies the persistent volumes to be destroyed.</p>
+we specify the persistent volumes to be destroyed.</p>
 
 <pre><code>{
   "type" : Offer::Operation::DESTROY,
@@ -284,9 +281,9 @@ specifies the persistent volumes to be d
 }
 </code></pre>
 
-<p>If this request succeeds, the persistent volume will be destroyed but the disk
-resources will still be reserved. As such, a subsequent resource offer will
-contain the following reserved disk resources:</p>
+<p>The persistent volume will be destroyed, but the disk resources will still be
+reserved. As such, the subsequent resource offer will <strong>contain</strong> the following
+reserved disk resources:</p>
 
 <pre><code>{
   "id" : &lt;offer_id&gt;,
@@ -307,112 +304,13 @@ contain the following reserved disk reso
 }
 </code></pre>
 
-<p>Those reserved resources can then be used as normal: e.g., they can be used to
-create another persistent volume or can be unreserved.</p>
-
-<p>Garbage collection for persistent volumes is planned but has not been
-implemented yet &ndash; <a href="https://issues.apache.org/jira/browse/MESOS-2408">MESOS-2408</a>.
-In the mean time, even after you destroy a persistent volume, its content will
-remain on disk.</p>
-
-<h3>Operator HTTP Endpoints</h3>
-
-<p>As described above, persistent volumes can be created by a framework scheduler
-as part of the resource offer cycle. Persistent volumes can also be created and
-destroyed by sending HTTP requests to the <code>/create-volumes</code> and
-<code>/destroy-volumes</code> endpoints, respectively. This capability is intended for use
-by operators and administrative tools.</p>
-
-<h4><code>/create-volumes</code></h4>
-
-<p>To use this endpoint, the operator should first ensure that a reservation for
-the necessary resources has been made on the appropriate slave (e.g., by using
-the <code>/reserve</code> HTTP endpoint or by configuring a static reservation).</p>
-
-<p>To create a 512MB persistent volume for the <code>ads</code> role on a dynamically reserved
-disk resource, we can send a request like so:</p>
-
-<pre><code>curl -i \
-     -u &lt;operator_principal&gt;:&lt;password&gt; \
-     -d slaveId=&lt;slave_id&gt; \
-     -d volumes='[
-       {
-         "name": "disk",
-         "type": "SCALAR",
-         "scalar": { "value": 512 },
-         "role": "ads",
-         "reservation": {
-           "principal": &lt;operator_principal&gt;
-         },
-         "disk": {
-           "persistence": {
-             "id" : &lt;persistence_id&gt;
-           },
-           "volume": {
-             "mode": "RW",
-             "container_path": &lt;path&gt;
-           }
-         }
-       }
-     ]' \
-     -X POST http://&lt;ip&gt;:&lt;port&gt;/master/create-volumes
-</code></pre>
-
-<p>The user receives one of the following HTTP responses:</p>
-
-<ul>
-<li><code>200 OK</code>: Success (the persistent volumes have been created).</li>
-<li><code>400 BadRequest</code>: Invalid arguments (e.g., missing parameters).</li>
-<li><code>401 Unauthorized</code>: Unauthorized request.</li>
-<li><code>409 Conflict</code>: Insufficient resources to create the volumes.</li>
-</ul>
-
-
-<p>Note that a single <code>/create-volumes</code> request can create multiple persistent
-volumes, but all of the volumes must be on the same slave.</p>
-
-<h4><code>/destroy-volumes</code></h4>
-
-<p>To destroy the volume created above, we can send an HTTP POST like so:</p>
-
-<pre><code>curl -i \
-     -u &lt;operator_principal&gt;:&lt;password&gt; \
-     -d slaveId=&lt;slave_id&gt; \
-     -d volumes='[
-       {
-         "name": "disk",
-         "type": "SCALAR",
-         "scalar": { "value": 512 },
-         "role": "ads",
-         "reservation": {
-           "principal": &lt;operator_principal&gt;
-         },
-         "disk": {
-           "persistence": {
-             "id" : &lt;persistence_id&gt;
-           },
-           "volume": {
-             "mode": "RW",
-             "container_path": &lt;path&gt;
-           }
-         }
-       }
-     ]' \
-     -X POST http://&lt;ip&gt;:&lt;port&gt;/master/destroy-volumes
-</code></pre>
-
-<p>The user receives one of the following HTTP responses:</p>
-
-<ul>
-<li><code>200 OK</code>: Success (the volumes have been destroyed).</li>
-<li><code>400 BadRequest</code>: Invalid arguments (e.g., missing parameters).</li>
-<li><code>401 Unauthorized</code>: Unauthorized request.</li>
-<li><code>409 Conflict</code>: Insufficient resources to destroy the volumes.</li>
-</ul>
+<p>Note that in 0.23, even after you destroy the persistent volume, its content
+will still be on the disk. The garbage collection for persistent volumes is
+coming soon: <a href="https://issues.apache.org/jira/browse/MESOS-2408">MESOS-2048</a>.</p>
 
+<h3><code>/create</code> (<em>Coming Soon</em>)</h3>
 
-<p>Note that a single <code>/destroy-volumes</code> request can destroy multiple persistent
-volumes, but all of the volumes must be on the same slave.</p>
+<h3><code>/destroy</code> (<em>Coming Soon</em>)</h3>
 
 	</div>
 </div>

Modified: mesos/site/publish/documentation/latest/reconciliation/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/reconciliation/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/reconciliation/index.html (original)
+++ mesos/site/publish/documentation/latest/reconciliation/index.html Tue Jan 19 17:00:59 2016
@@ -187,7 +187,7 @@ is bounded by the <code>--slave_reregist
 <li>let <code>remaining = { T in tasks | T is non-terminal }</code></li>
 <li>Perform reconciliation: <code>reconcile(remaining)</code></li>
 <li>Wait for status updates to arrive (use truncated exponential backoff). For each update, note the time of arrival.</li>
-<li>let <code>remaining = { T in remaining | T.last_update_arrival() &lt; start }</code></li>
+<li>let <code>remaining = { T ϵ remaining | T.last_update_arrival() &lt; start }</code></li>
 <li>If <code>remaining</code> is non-empty, go to 3.</li>
 </ol>
 

Modified: mesos/site/publish/documentation/latest/release-guide/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/release-guide/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/release-guide/index.html (original)
+++ mesos/site/publish/documentation/latest/release-guide/index.html Tue Jan 19 17:00:59 2016
@@ -162,7 +162,6 @@ the master, slave, and configure flags.<
 a live cluster from the previous release version to this release version.</p></li>
 <li><p>If this is a major release, please ensure that user documentation has been
 added for any new features.</p></li>
-<li><p>Make sure that for any updates of the API, specifically the scheduler API, the public mesos protobuf definitions are part of both, <code>include/mesos</code> as well as <code>include/mesos/v1</code>. NOTE: This might actually demand code updates if any omissions were identified.</p></li>
 </ol>
 
 
@@ -193,7 +192,7 @@ It is recommended to use the <code>suppo
    You may need to modify your local copy of tag.sh for it to complete successfully.</p></blockquote></li>
 <li><p>It is not uncommon to release multiple release candidates, with increasing release candidate
 version, if there are bugs found.</p></li>
-<li><p>Update to the <em>next</em> Mesos version in <code>configure.ac</code>: change <code>AC_INIT([mesos], [X.Y.Z]))</code>, as well as in <code>CMakeLists.txt</code>: change <code>set(MESOS_MAJOR_VERSION X)</code>, <code>set(MESOS_MINOR_VERSION Y)</code>, <code>set(MESOS_PATCH_VERSION Z)</code> and then commit.</p></li>
+<li><p>Update to the <em>next</em> Mesos version in <code>configure.ac</code>: change <code>AC_INIT([mesos], [X.Y.Z]))</code> and commit.</p></li>
 </ol>
 
 

Modified: mesos/site/publish/documentation/latest/reservation/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/reservation/index.html?rev=1725568&r1=1725567&r2=1725568&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/reservation/index.html (original)
+++ mesos/site/publish/documentation/latest/reservation/index.html Tue Jan 19 17:00:59 2016
@@ -131,28 +131,18 @@ specified via the existing ACL mechanism
 <li><code>Offer::Operation::Reserve</code> and <code>Offer::Operation::Unreserve</code> messages are
 available for <strong>frameworks</strong> to send back via the <code>acceptOffers</code> API as a
 response to a resource offer.</li>
-<li><code>/reserve</code> and <code>/unreserve</code> HTTP endpoints allow <strong>operators</strong> to manage
-dynamic reservations through the master.</li>
+<li><code>/reserve</code> and <code>/unreserve</code> HTTP endpoints are available for <strong>operators</strong>
+to manage dynamic reservations through the master. (<em>Coming Soon</em>).</li>
 </ul>
 
 
 <p>In the following sections, we will walk through examples of each of the
 interfaces described above.</p>
 
-<p>Note that if two dynamic reservations are made for resources at a single slave,
-the reservations will be combined by adding together the resources reserved by
-each request. Similarly, &ldquo;partial&rdquo; unreserve operations are allowed: an
-unreserve operation can release only some of the resources at a slave that have
-been reserved for a given role. In this case, the unreserved resources will be
-subtracted from the previous reservation, and any remaining resources will still
-be reserved.</p>
+<h3><code>Offer::Operation::Reserve</code></h3>
 
-<h3>Framework Scheduler API</h3>
-
-<h4><code>Offer::Operation::Reserve</code></h4>
-
-<p>A framework can reserve resources through the resource offer cycle.  Suppose we
-receive a resource offer with 12 CPUs and 6144 MB of RAM unreserved.</p>
+<p>A framework is able to reserve resources through the resource offer cycle.
+Suppose we receive a resource offer with 12 CPUs and 6144 MB of RAM unreserved.</p>
 
 <pre><code>    {
       "id": &lt;offer_id&gt;,
@@ -208,8 +198,7 @@ the <code>role</code> and <code>principa
     }
 </code></pre>
 
-<p>If the reservation is successful, a subsequent resource offer will contain the
-following reserved resources:</p>
+<p>The subsequent resource offer will <strong>contain</strong> the following reserved resources:</p>
 
 <pre><code>    {
       "id": &lt;offer_id&gt;,
@@ -239,14 +228,13 @@ following reserved resources:</p>
     }
 </code></pre>
 
-<h4><code>Offer::Operation::Unreserve</code></h4>
+<h3><code>Offer::Operation::Unreserve</code></h3>
 
-<p>A framework can unreserve resources through the resource offer cycle.
+<p>A framework is able to unreserve resources through the resource offer cycle.
 In <a href="#offeroperationreserve">Offer::Operation::Reserve</a>, we reserved 8 CPUs
-and 4096 MB of RAM on a particular slave for our <code>role</code>. The master will
-continue to only offer these resources to our <code>role</code>. Suppose we would like to
-unreserve these resources. First, we receive a resource offer (copy/pasted
-from above):</p>
+and 4096 MB of RAM for our <code>role</code>. The master will continue to offer these
+resources to our <code>role</code>. Suppose we would like to unreserve these resources.
+First, we receive a resource offer (copy/pasted from above):</p>
 
 <pre><code>    {
       "id": &lt;offer_id&gt;,
@@ -276,9 +264,9 @@ from above):</p>
     }
 </code></pre>
 
-<p>We can unreserve the 8 CPUs and 4096 MB of RAM by sending the following
+<p>We unreserve the 8 CPUs and 4096 MB of RAM by sending the following
 <code>Offer::Operation</code> message. <code>Offer::Operation::Unreserve</code> has a <code>resources</code> field
-which we can use to specify the resources to be unreserved.</p>
+which we specify with the resources to be unreserved.</p>
 
 <pre><code>    {
       "type": Offer::Operation::UNRESERVE,
@@ -309,44 +297,34 @@ which we can use to specify the resource
 
 <p>The unreserved resources may now be offered to other frameworks.</p>
 
-<h3>Operator HTTP Endpoints</h3>
+<h3><code>/reserve</code> (since 0.25.0)</h3>
 
-<p>As described above, dynamic reservations can be made by a framework scheduler,
-typically in response to a resource offer. However, dynamic reservations can
-also be created and deleted by sending HTTP requests to the <code>/reserve</code> and
-<code>/unreserve</code> endpoints, respectively. This capability is intended for use by
-operators and administrative tools.</p>
-
-<h4><code>/reserve</code> (since 0.25.0)</h4>
-
-<p>Suppose we want to reserve 8 CPUs and 4096 MB of RAM for the <code>ads</code> role on a
-slave with id=<code>&lt;slave_id&gt;</code> (note that it is up to the user to find the ID of the
-slave that hosts the desired resources; the request will fail if sufficient
-unreserved resources cannot be found on the slave). We send an HTTP POST request
-to the <code>/reserve</code> HTTP endpoint like so:</p>
+<p>Suppose we want to reserve 8 CPUs and 4096 MB of RAM for the <code>ads</code> role on
+a slave with id=<code>&lt;slave_id&gt;</code>. We send an HTTP POST request to the <code>/reserve</code>
+HTTP endpoint like so:</p>
 
 <pre><code>    $ curl -i \
       -u &lt;operator_principal&gt;:&lt;password&gt; \
       -d slaveId=&lt;slave_id&gt; \
-      -d resources='[
-        {
-          "name": "cpus",
-          "type": "SCALAR",
-          "scalar": { "value": 8 },
-          "role": "ads",
-          "reservation": {
-            "principal": &lt;operator_principal&gt;
-          }
-        },
-        {
-          "name": "mem",
-          "type": "SCALAR",
-          "scalar": { "value": 4096 },
-          "role": "ads",
-          "reservation": {
-            "principal": &lt;operator_principal&gt;
-          }
-        }
+      -d resources='[ \
+        { \
+          "name": "cpus", \
+          "type": "SCALAR", \
+          "scalar": { "value": 8 }, \
+          "role": "ads", \
+          "reservation": { \
+            "principal": &lt;operator_principal&gt; \
+          } \
+        }, \
+        { \
+          "name": "mem", \
+          "type": "SCALAR", \
+          "scalar": { "value": 4096 }, \
+          "role": "ads", \
+          "reservation": { \
+            "principal": &lt;operator_principal&gt; \
+          } \
+        } \
       ]' \
       -X POST http://&lt;ip&gt;:&lt;port&gt;/master/reserve
 </code></pre>
@@ -354,14 +332,14 @@ to the <code>/reserve</code> HTTP endpoi
 <p>The user receives one of the following HTTP responses:</p>
 
 <ul>
-<li><code>200 OK</code>: Success (the requested resources have been reserved).</li>
-<li><code>400 BadRequest</code>: Invalid arguments (e.g., missing parameters).</li>
+<li><code>200 OK</code>: Success</li>
+<li><code>400 BadRequest</code>: Invalid arguments (e.g. missing parameters).</li>
 <li><code>401 Unauthorized</code>: Unauthorized request.</li>
 <li><code>409 Conflict</code>: Insufficient resources to satisfy the reserve operation.</li>
 </ul>
 
 
-<h4><code>/unreserve</code> (since 0.25.0)</h4>
+<h3><code>/unreserve</code> (since 0.25.0)</h3>
 
 <p>Suppose we want to unreserve the resources that we dynamically reserved above.
 We can send an HTTP POST request to the <code>/unreserve</code> HTTP endpoint like so:</p>
@@ -369,25 +347,25 @@ We can send an HTTP POST request to the
 <pre><code>    $ curl -i \
       -u &lt;operator_principal&gt;:&lt;password&gt; \
       -d slaveId=&lt;slave_id&gt; \
-      -d resources='[
-        {
-          "name": "cpus",
-          "type": "SCALAR",
-          "scalar": { "value": 8 },
-          "role": "ads",
-          "reservation": {
-            "principal": &lt;operator_principal&gt;
-          }
-        },
-        {
-          "name": "mem",
-          "type": "SCALAR",
-          "scalar": { "value": 4096 },
-          "role": "ads",
-          "reservation": {
-            "principal": &lt;operator_principal&gt;
-          }
-        }
+      -d resources='[ \
+        { \
+          "name": "cpus", \
+          "type": "SCALAR", \
+          "scalar": { "value": 8 }, \
+          "role": "ads", \
+          "reservation": { \
+            "principal": &lt;operator_principal&gt; \
+          } \
+        }, \
+        { \
+          "name": "mem", \
+          "type": "SCALAR", \
+          "scalar": { "value": 4096 }, \
+          "role": "ads", \
+          "reservation": { \
+            "principal": &lt;operator_principal&gt; \
+          } \
+        } \
       ]' \
       -X POST http://&lt;ip&gt;:&lt;port&gt;/master/unreserve
 </code></pre>
@@ -395,10 +373,10 @@ We can send an HTTP POST request to the
 <p>The user receives one of the following HTTP responses:</p>
 
 <ul>
-<li><code>200 OK</code>: Success (the requested resources have been unreserved).</li>
-<li><code>400 BadRequest</code>: Invalid arguments (e.g., missing parameters).</li>
+<li><code>200 OK</code>: Success</li>
+<li><code>400 BadRequest</code>: Invalid arguments (e.g. missing parameters).</li>
 <li><code>401 Unauthorized</code>: Unauthorized request.</li>
-<li><code>409 Conflict</code>: Insufficient resources to satisfy the unreserve operation.</li>
+<li><code>409 Conflict</code>: Insufficient resources to satisfy unreserve operation.</li>
 </ul>